Jaymr/zszq-trs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat:打通前后端链路。老风控新风控映射：禁止=》Error，需审批=》RiskWarning(新状态，需二次确认，并记录日志)，提示、通过=》Success（提示增加TIpMessage)

Browse Source
This commit is contained in:
ruisu
2026-06-26 17:01:21 +08:00
parent 32b7de93e2
commit 0c2a4b3afb
10 changed files with 197 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
YLErpDAL/Modules/RiskModule/QuotaMonitorService.cs
+37 -6
View File
@@ -4332,7 +4332,12 @@ namespace YLErp.Modules.RiskModule
public bool QuotaCheck(ref TradeOpenResult res)
{
if (res == null && res.Trade == null)
return QuotaCheck(ref res, false);
}
public bool QuotaCheck(ref TradeOpenResult res, bool ignoreRiskWarning)
{
if (res == null || res.Trade == null)
{
throw new ArgumentNullException(nameof(res));
}
@@ -4349,6 +4354,12 @@ namespace YLErp.Modules.RiskModule
res.TrialDataId = quotaObj.id;
return false;
}
//成功状态下，如果触发TIp检查，提示用户
if (!string.IsNullOrWhiteSpace(quotaObj.RiskWarningDetails))
{
res.TrialDataId = quotaObj.id;
res.TipMsg = quotaObj.RiskWarningDetails;
}
return true;
}
var lastTrial = trialService.QueryLastQuotaTrial(tradeId, true);
@@ -4357,8 +4368,17 @@ namespace YLErp.Modules.RiskModule
new TradeRiskCheckLogService(UserInfo).AddLog(quotaObj);
}
//否则的情况是上次没算,这次是预警,或上次算了,结果是不通过\通过或预警,这次是预警或不通过,提示用户;
res.RetCode = TradeOpenRetCode.QuotaTrialError;
res.TrialDataId = quotaObj.id;
res.ErrorMsg = quotaObj.RiskWarningDetails;
var isRiskApprovalWarning = quotaObj.TrialStatus == QuotaTrialStatusEnum.Warning
&& !string.IsNullOrWhiteSpace(quotaObj.RiskWarningDetails);
//需清除ErrorMsg，不然外部调用会认为失败
if (ignoreRiskWarning && isRiskApprovalWarning)
{
res.ErrorMsg = string.Empty;
return true;
}
res.RetCode = isRiskApprovalWarning ? TradeOpenRetCode.RiskWarning : TradeOpenRetCode.QuotaTrialError;
return false;
}
@@ -4947,7 +4967,7 @@ namespace YLErp.Modules.RiskModule
riskContext.DataMap["trade"] = tradeObj;
var riskResult = riskEngine.EvaluateRisk(riskContext, "BOOK_CONFIRM");
_logger.Info($"[风控引擎] 簿记交易确认 - TradeId: {tradeId}, Passed: {riskResult.Passed}, Blocked: {riskResult.Blocked}, NeedApproval: {riskResult.NeedApproval}");
_logger.Info($"[风控引擎] 簿记交易确认 - TradeId: {tradeId}, Passed: {riskResult.Passed}, Blocked: {riskResult.Blocked}, NeedApproval: {riskResult.NeedApproval}, ShowTip: {riskResult.ShowTip}");
// 按策略映射回 QuotaTrialStatusEnum
if (riskResult.Blocked)
@@ -4961,16 +4981,27 @@ namespace YLErp.Modules.RiskModule
}
if (riskResult.NeedApproval)
{
result.TrialStatus = QuotaTrialStatusEnum.Warning;
if (result.TrialStatus != QuotaTrialStatusEnum.Error)
{
result.TrialStatus = QuotaTrialStatusEnum.Warning;
}
result.RiskWarningDetails += "[风控引擎] 规则触发：需审批\n";
foreach (var triggeredRule in riskResult.TriggeredRules.Where(r => r.ControlStrategy == RiskControlStrategy.Approval))
{
result.RiskWarningDetails += $"规则ID:{triggeredRule.RuleId}；规则名称:{triggeredRule.RuleName}；规则说明:{triggeredRule.RuleText}\n";
}
}
if (riskResult.Warnings != null && riskResult.Warnings.Count > 0)
if (riskResult.ShowTip)
{
result.RiskWarningDetails += "[风控引擎] 提示：" + string.Join("；", riskResult.Warnings) + "\n";
var warningMessages = riskResult.TriggeredRules
.Where(r => r.ControlStrategy == RiskControlStrategy.ShowTip)
.Select(r => r.Message)
.Where(r => !string.IsNullOrWhiteSpace(r))
.ToList();
if (warningMessages.Count > 0)
{
result.RiskWarningDetails += "[风控引擎] 提示：" + string.Join("；", warningMessages) + "\n";
}
}
}
catch (Exception ex)
YLErpDAL/Modules/RiskModule/TradeRiskCheckLogService.cs
+34 -1
View File
@@ -1,4 +1,4 @@
using BaseOUDAL;
using BaseOUDAL;
using MoreLinq;
using OfficeOpenXml;
using Snowflake.Core;
@@ -146,6 +146,39 @@ namespace YLErp.Modules.RiskModule
DbContext.SaveChanges();
}
public void AddWarningDecisionLog(int quotaTrialId, string decision)
{
var quotaTrial = DbContext.quotaTrial.FirstOrDefault(x => x.id == quotaTrialId);
if (quotaTrial == null)
{
return;
}
var td = DbContext.trade.FirstOrDefault(x => x.id == quotaTrial.TradeId);
trade_risk_check_log log = new trade_risk_check_log();
if (td != null)
{
var client = DataCacheProvider.GetClientDataSource().GetData(td.ClientId);
log.client_number = client?.Number;
}
var worker = new IdWorker(1, 1);
log.id = worker.NextId();
log.trial_result = (int)quotaTrial.TrialStatus;
log.client_name = quotaTrial.ClientName;
log.trader = td?.TraderName;
log.trade_number = quotaTrial.TradeNumber;
log.risk_warning = string.IsNullOrWhiteSpace(quotaTrial.RiskWarningDetails)
? $"[风控预警处理]{decision}"
: quotaTrial.RiskWarningDetails + Environment.NewLine + $"[风控预警处理]{decision}";
log.limit_warning = quotaTrial.QuotaCheckDetails;
log.remark = string.IsNullOrWhiteSpace(quotaTrial.Remark)
? $"风控预警处理结果：{decision}"
: quotaTrial.Remark + "；风控预警处理结果：" + decision;
log.create_user = UserId;
log.create_time = DateTime.Now;
DbContext.trade_risk_check_log.Add(log);
DbContext.SaveChanges();
}
/// <summary>
/// 回退重置
/// </summary>