Merge branch 'feature/p132_74-risk-engine' of https://gitee.glmszq.com/gsty/onederiv/trs into feature/p132_74-risk-engine

2026-08-05 17:27:15 +08:00
parent 715068b759 cfd5efd3d3
commit a889925440
16 changed files with 997 additions and 963 deletions
@@ -122,6 +122,9 @@ namespace YLErp.Modules.TradeModule.DealModule
                    {
                        result.LackOfMoney = true;
                        result.OldRiskNeedSpecialApproval = temp.OldRiskNeedSpecialApproval;
+                        // 保留新风控独立状态，供上层决定展示组合特批或仅展示禁止详情。
+                        result.NewRiskBlocked = temp.NewRiskBlocked;
+                        result.NewRiskNeedApproval = temp.NewRiskNeedApproval;
                        result.TrialDataId = temp.TrialDataId;
                        result.TradeId = temp.Trade.id;
                        result.ignoreRiskRuleIds = temp.IgnoredRiskRuleIds;
@@ -634,6 +637,17 @@ namespace YLErp.Modules.TradeModule.DealModule
    {
        public bool LackOfMoney;
        public bool OldRiskNeedSpecialApproval;
+
+        /// <summary>
+        /// 新风控是否命中禁止规则
+        /// </summary>
+        public bool NewRiskBlocked;
+
+        /// <summary>
+        /// 新风控是否命中需审批规则
+        /// </summary>
+        public bool NewRiskNeedApproval;
+
        public int TrialDataId;
        public int TradeId;
        public List<int> confirmedTradeIds;
@@ -804,6 +804,16 @@ namespace YLErp.Modules.TradeModule.DealModule
        public List<string> IgnoredRiskRuleIds;
        public bool OldRiskNeedSpecialApproval;

+        /// <summary>
+        /// 新风控是否命中禁止规则
+        /// </summary>
+        public bool NewRiskBlocked;
+
+        /// <summary>
+        /// 新风控是否命中需审批规则
+        /// </summary>
+        public bool NewRiskNeedApproval;
+
        /// <summary>
        /// 错误信息
        /// </summary>