From f2a1598d1de3df99ae640fe961bb50816b0bdb85 Mon Sep 17 00:00:00 2001
From: ruisu <ruisu@glms.com.cn>
Date: Fri, 14 Aug 2026 15:16:36 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E5=A2=9E=E5=8A=A0=E5=B9=B3?=
 =?UTF-8?q?=E4=BB=93=E6=89=80=E9=9C=80=E9=A3=8E=E6=8E=A7=E4=B8=8A=E4=B8=8B?=
 =?UTF-8?q?=E6=96=87=E8=A6=81=E7=B4=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 YLErpDAL/Modules/RiskEngine/Compile/RuleCompiler.cs |  3 +++
 YLErpDAL/Modules/RiskEngine/RiskContext.cs          |  2 ++
 YLErpDAL/Modules/RiskEngine/RiskRuleService.cs      | 10 ++++------
 YLErpDAL/Modules/SwapModule/SwapDealService.cs      |  3 ++-
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/YLErpDAL/Modules/RiskEngine/Compile/RuleCompiler.cs b/YLErpDAL/Modules/RiskEngine/Compile/RuleCompiler.cs
index 0890d97e..c5a5fc68 100644
--- a/YLErpDAL/Modules/RiskEngine/Compile/RuleCompiler.cs
+++ b/YLErpDAL/Modules/RiskEngine/Compile/RuleCompiler.cs
@@ -31,6 +31,8 @@ namespace YLErp.Modules.RiskEngine
         /// </summary>
         public DateTime? UnwindDate { get; set; }
 
+        public DateTime? PayDate { get; set; }
+
         /// <summary>
         /// 数据库上下文，供规则公式直接查询数据库
         /// </summary>
@@ -402,6 +404,7 @@ namespace YLErp.Modules.RiskEngine
                         TradeId = ctx.TradeId,
                         TriggerPoint = ctx.TriggerPoint,
                         UnwindDate = ctx.UnwindDate,
+                        PayDate = ctx.PayDate,
                         DbContext = ctx.DbContext
                     };
                     return runner(globals).GetAwaiter().GetResult();
diff --git a/YLErpDAL/Modules/RiskEngine/RiskContext.cs b/YLErpDAL/Modules/RiskEngine/RiskContext.cs
index a87f9f7c..7a86b0a1 100644
--- a/YLErpDAL/Modules/RiskEngine/RiskContext.cs
+++ b/YLErpDAL/Modules/RiskEngine/RiskContext.cs
@@ -22,6 +22,8 @@ namespace YLErp.Modules.RiskEngine
         /// </summary>
         public DateTime? UnwindDate { get; set; }
 
+        public DateTime? PayDate { get; set; }
+
         /// <summary>
         /// 数据库上下文，供规则公式直接查询数据库
         /// </summary>
diff --git a/YLErpDAL/Modules/RiskEngine/RiskRuleService.cs b/YLErpDAL/Modules/RiskEngine/RiskRuleService.cs
index 6cd51d3e..295a5f18 100644
--- a/YLErpDAL/Modules/RiskEngine/RiskRuleService.cs
+++ b/YLErpDAL/Modules/RiskEngine/RiskRuleService.cs
@@ -202,8 +202,7 @@ namespace YLErp.Modules.RiskEngine
             "BOOK_CONFIRM",
             "CLOSE_REVIEW",
             "UPLOAD_CONFIRMATION",
-            "EVENT_TRIGGER",
-            "FUND_PAYMENT"
+            "EVENT_TRIGGER"
         };
 
 
@@ -792,11 +791,10 @@ namespace YLErp.Modules.RiskEngine
 
         private static readonly Dictionary<string, string> TriggerPointCnMap = new Dictionary<string, string>
         {
-            ["BOOK_CONFIRM"] = "交易录入确认",
-            ["CLOSE_REVIEW"] = "平仓审核",
+            ["BOOK_CONFIRM"] = "簿记交易确认",
+            ["CLOSE_REVIEW"] = "平仓审核提交",
             ["UPLOAD_CONFIRMATION"] = "上传确认书",
-            ["EVENT_TRIGGER"] = "事件触发",
-            ["FUND_PAYMENT"] = "资金支付"
+            ["EVENT_TRIGGER"] = "事件发生时"
         };
 
         /// <summary>
diff --git a/YLErpDAL/Modules/SwapModule/SwapDealService.cs b/YLErpDAL/Modules/SwapModule/SwapDealService.cs
index 45dd3142..2ef85c63 100644
--- a/YLErpDAL/Modules/SwapModule/SwapDealService.cs
+++ b/YLErpDAL/Modules/SwapModule/SwapDealService.cs
@@ -1918,7 +1918,8 @@ namespace YLErp.Modules.SwapModule
             {
                 TradeId = unwindData.SwapTradeId,
                 TriggerPoint = triggerPoint,
-                UnwindDate = unwindData.UnwindDate
+                UnwindDate = unwindData.UnwindDate,
+                PayDate = unwindData.PayDate
             };
             return new RiskTrialService(this).CheckRisk(riskContext, closeTrialSource, confirmation);
         }