|
@@ -20,7 +20,7 @@ namespace molilian.api.Controllers
|
|
|
[HttpGet]
|
|
[HttpGet]
|
|
|
public async Task<ActionResult> AccountWarning()
|
|
public async Task<ActionResult> AccountWarning()
|
|
|
{
|
|
{
|
|
|
- IEnumerable<TkPoolDTO> tb_list = await TkPoolCore.ListAsync();
|
|
|
|
|
|
|
+ IEnumerable<TkPoolDTO> tb_list = await TkPoolCore.AllListAsync();
|
|
|
|
|
|
|
|
List<string> typeKeys = new List<string>();
|
|
List<string> typeKeys = new List<string>();
|
|
|
List<string> riskStrategyKeys = new List<string>();
|
|
List<string> riskStrategyKeys = new List<string>();
|
|
@@ -50,10 +50,10 @@ namespace molilian.api.Controllers
|
|
|
{
|
|
{
|
|
|
// riskStrategyKey 格式为 "riskStrategy-launchScene"
|
|
// riskStrategyKey 格式为 "riskStrategy-launchScene"
|
|
|
string[] parts = riskStrategyKey.Split('-');
|
|
string[] parts = riskStrategyKey.Split('-');
|
|
|
- if (parts.Length == 2)
|
|
|
|
|
|
|
+ if (parts.Length >= 2)
|
|
|
{
|
|
{
|
|
|
string riskStrategy = parts[0];
|
|
string riskStrategy = parts[0];
|
|
|
- if (int.TryParse(parts[1], out int launchScene))
|
|
|
|
|
|
|
+ if (int.TryParse(parts[^1], out int launchScene))
|
|
|
{
|
|
{
|
|
|
var riskAccounts = tb_list.Where(tb =>
|
|
var riskAccounts = tb_list.Where(tb =>
|
|
|
tb.riskStrategy == riskStrategy &&
|
|
tb.riskStrategy == riskStrategy &&
|
|
@@ -67,7 +67,7 @@ namespace molilian.api.Controllers
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- IEnumerable<JdPoolDTO> jd_list = await JdPoolCore.ListAsync();
|
|
|
|
|
|
|
+ IEnumerable<JdPoolDTO> jd_list = await JdPoolCore.AllListAsync();
|
|
|
|
|
|
|
|
List<string> jdTypeKeys = new List<string>();
|
|
List<string> jdTypeKeys = new List<string>();
|
|
|
List<string> jdRiskStrategyKeys = new List<string>();
|
|
List<string> jdRiskStrategyKeys = new List<string>();
|
|
@@ -77,6 +77,7 @@ namespace molilian.api.Controllers
|
|
|
// 收集京东的 typeKeys 和 riskStrategyKeys
|
|
// 收集京东的 typeKeys 和 riskStrategyKeys
|
|
|
foreach (JdPoolDTO jd in jd_list)
|
|
foreach (JdPoolDTO jd in jd_list)
|
|
|
{
|
|
{
|
|
|
|
|
+ if (jd.id < 38) continue;
|
|
|
if (!string.IsNullOrEmpty(jd.parse_type) && !jdTypeKeys.Contains(jd.parse_type)) jdTypeKeys.Add(jd.parse_type);
|
|
if (!string.IsNullOrEmpty(jd.parse_type) && !jdTypeKeys.Contains(jd.parse_type)) jdTypeKeys.Add(jd.parse_type);
|
|
|
if (!string.IsNullOrEmpty(jd.riskStrategy))
|
|
if (!string.IsNullOrEmpty(jd.riskStrategy))
|
|
|
{
|
|
{
|
|
@@ -100,10 +101,10 @@ namespace molilian.api.Controllers
|
|
|
{
|
|
{
|
|
|
// riskStrategyKey 格式为 "riskStrategy-launchScene"
|
|
// riskStrategyKey 格式为 "riskStrategy-launchScene"
|
|
|
string[] parts = riskStrategyKey.Split('-');
|
|
string[] parts = riskStrategyKey.Split('-');
|
|
|
- if (parts.Length == 2)
|
|
|
|
|
|
|
+ if (parts.Length >= 2)
|
|
|
{
|
|
{
|
|
|
string riskStrategy = parts[0];
|
|
string riskStrategy = parts[0];
|
|
|
- if (int.TryParse(parts[1], out int launchScene))
|
|
|
|
|
|
|
+ if (int.TryParse(parts[^1], out int launchScene))
|
|
|
{
|
|
{
|
|
|
var riskAccounts = jd_list.Where(jd =>
|
|
var riskAccounts = jd_list.Where(jd =>
|
|
|
jd.riskStrategy == riskStrategy &&
|
|
jd.riskStrategy == riskStrategy &&
|