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

Revert ruisu合并进来的代码

Browse Source
This commit is contained in:
锦麟 王
2026-07-03 17:41:42 +08:00
parent cf15877bfd
commit f0ad4406c9
9 changed files with 171 additions and 296 deletions
Download Patch File Download Diff File Expand all files Collapse all files
YLErpDAL/Modules/RiskModule/QuotaMonitorService.cs
+3 -33
View File
@@ -4464,12 +4464,7 @@ namespace YLErp.Modules.RiskModule
public bool QuotaCheck(ref TradeOpenResult res)
{
return QuotaCheck(ref res, false);
}
public bool QuotaCheck(ref TradeOpenResult res, bool ignoreRiskWarning)
{
if (res == null || res.Trade == null)
if (res == null && res.Trade == null)
{
throw new ArgumentNullException(nameof(res));
}
@@ -4478,7 +4473,7 @@ namespace YLErp.Modules.RiskModule
var tradeNumber = DbContext.trade.Where(O => O.id == tradeId).Select(O => O.TradeNumber).FirstOrDefault();
var trialService = new QuotaMonitorService(this);
var quotaObj = trialService.QuotaCheck(tradeId, 1);
if (quotaObj.TrialStatus == QuotaTrialStatusEnum.Success)//这次计算结果是通过,直接通过
if (quotaObj.TrialStatus == QuotaTrialStatusEnum.Success)//这次计算结果是通过,直接通过
{
if (!string.IsNullOrWhiteSpace(quotaObj.AvailableForClient)) // 返回用户资金情况
{
@@ -4486,12 +4481,6 @@ 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);
@@ -4500,27 +4489,8 @@ namespace YLErp.Modules.RiskModule
new TradeRiskCheckLogService(UserInfo).AddLog(quotaObj);
}
//否则的情况是上次没算,这次是预警,或上次算了,结果是不通过\通过或预警,这次是预警或不通过,提示用户;
res.RetCode = TradeOpenRetCode.QuotaTrialError;
res.TrialDataId = quotaObj.id;
//汇总各类检查详情，避免只展示RiskWarningDetails而漏掉其它老风控检查
var detailParts = new List<string>();
if (!string.IsNullOrWhiteSpace(quotaObj.FundCheckDetails))
detailParts.Add($"应付资金检查：{quotaObj.FundCheckDetails}");
if (!string.IsNullOrWhiteSpace(quotaObj.QuotaCheckDetails))
detailParts.Add($"限额检查：{quotaObj.QuotaCheckDetails}");
if (!string.IsNullOrWhiteSpace(quotaObj.RiskWarningDetails))
detailParts.Add($"风险预警：{quotaObj.RiskWarningDetails}");
if (!string.IsNullOrWhiteSpace(quotaObj.QuotaWarningDetails))
detailParts.Add($"限额预警：{quotaObj.QuotaWarningDetails}");
res.ErrorMsg = string.Join("\n", detailParts);
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;
}