From f163b5ba79251c5813646a78e084527e0721f5da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=94=A6=E9=BA=9F=20=E7=8E=8B?= <Jinlin.Wang@cicc.com.cn>
Date: Wed, 22 Apr 2026 13:29:04 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=9B=B4=E6=96=B0=E7=94=A8=E5=8D=B0?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E6=8F=90=E5=8F=96=E9=80=BB=E8=BE=91=EF=BC=8C?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA=E4=BB=8E=20fjFileInfo=20=E4=B8=AD=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Modules/TradeModule/TradeOAService.cs     | 51 ++++++-------------
 1 file changed, 15 insertions(+), 36 deletions(-)

diff --git a/YLErpDAL/Modules/TradeModule/TradeOAService.cs b/YLErpDAL/Modules/TradeModule/TradeOAService.cs
index 5d55d237..88e081a4 100644
--- a/YLErpDAL/Modules/TradeModule/TradeOAService.cs
+++ b/YLErpDAL/Modules/TradeModule/TradeOAService.cs
@@ -548,10 +548,10 @@ namespace YLErp.Modules.TradeModule
                     return new TradeOAResult { TradeId = oa.trade_id, Success = false, Message = "未找到确认书文档" };
                 }
 
-                // 从 detailMap 中提取用印文件信息
-                if (!TryExtractFileFromDetailMap(queryData.flowInfos, out var fileId, out var fileName))
+                // 从 fjFileInfo 中提取用印文件信息
+                if (!TryExtractFileFromFjFileInfo(queryData.flowInfos, out var fileId, out var fileName))
                 {
-                    logger.Info($"无法从 detailMap 中提取用印文件信息，contract_code:{oa.contract_code}");
+                    logger.Info($"无法从 fjFileInfo 中提取用印文件信息，contract_code:{oa.contract_code}");
                     return new TradeOAResult { TradeId = oa.trade_id, Success = false, Message = "无法提取用印文件信息" };
                 }
 
@@ -630,53 +630,32 @@ namespace YLErp.Modules.TradeModule
         /// </summary>
         private bool HasStampFiles(Newtonsoft.Json.Linq.JObject flowInfos)
         {
-            var detailMap = flowInfos?["detailMap"];
-            if (detailMap == null || !detailMap.Any())
-            {
-                return false;
-            }
-
-            foreach (var detail in detailMap)
-            {
-                var fileInfos = detail["gatewayFileRequestFileInfo"];
-                if (fileInfos != null && fileInfos.Any())
-                {
-                    return true;
-                }
-            }
-
-            return false;
+            var fjFileInfo = flowInfos?["fjFileInfo"];
+            return fjFileInfo != null && fjFileInfo.Any();
         }
 
         /// <summary>
-        /// 从 detailMap 中提取用印文件 ID 和文件名
+        /// 从 fjFileInfo 中提取用印文件 ID 和文件名
         /// </summary>
-        private bool TryExtractFileFromDetailMap(Newtonsoft.Json.Linq.JObject flowInfos, out string fileId, out string fileName)
+        private bool TryExtractFileFromFjFileInfo(Newtonsoft.Json.Linq.JObject flowInfos, out string fileId, out string fileName)
         {
             fileId = null;
             fileName = null;
 
-            var detailMap = flowInfos?["detailMap"];
-            if (detailMap == null || !detailMap.Any())
+            var fjFileInfo = flowInfos?["fjFileInfo"];
+            if (fjFileInfo == null || !fjFileInfo.Any())
             {
                 return false;
             }
 
-            foreach (var detail in detailMap)
+            var firstFile = fjFileInfo.FirstOrDefault();
+            if (firstFile != null)
             {
-                var fileInfos = detail["gatewayFileRequestFileInfo"];
-                if (fileInfos != null && fileInfos.Any())
+                fileId = firstFile["id"]?.ToString();
+                fileName = firstFile["fileName"]?.ToString();
+                if (!string.IsNullOrEmpty(fileId))
                 {
-                    var firstFile = fileInfos.FirstOrDefault();
-                    if (firstFile != null)
-                    {
-                        fileId = firstFile["id"]?.ToString();
-                        fileName = firstFile["fileName"]?.ToString();
-                        if (!string.IsNullOrEmpty(fileId))
-                        {
-                            return true;
-                        }
-                    }
+                    return true;
                 }
             }