From c7c536782f3d5bf49a1f1f5c0bab38c2a4bd6def Mon Sep 17 00:00:00 2001
From: zhaoqing <1670883518@qq.com>
Date: Thu, 14 May 2026 13:55:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E5=B8=81=E5=80=BC=E6=8E=A8?=
 =?UTF-8?q?=E9=80=81=E4=BA=BA=E5=A7=93=E5=90=8D=E6=B7=BB=E5=8A=A0=E8=B5=8B?=
 =?UTF-8?q?=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/mhd/system/api/WlhyServiceFeign.java   |  5 +++--
 .../api/factory/RemoteWlhyFallbackFactory.java      |  2 +-
 .../ExchangeRateApplicationService.java             | 13 +++++++------
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WlhyServiceFeign.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WlhyServiceFeign.java
index a30cd0746..fdee7b2ed 100644
--- a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WlhyServiceFeign.java
+++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WlhyServiceFeign.java
@@ -550,6 +550,7 @@ public interface WlhyServiceFeign {
     @PostMapping("/ntocc/tmsSettlementExchangeRate/updatePushStatus")
     void updateExchangeRatePushStatus(@RequestParam("id") String id,
                                       @RequestParam("pushStatus") Integer pushStatus,
-                                      @RequestParam("pushTime") String pushTime,
-                                      @RequestParam("pushBy") Long pushBy);
+                                      @RequestParam(name="pushTime",required = false) String pushTime,
+                                      @RequestParam(name="pushBy",required = false) Long pushBy,
+                                      @RequestParam(name="pushByName",required = false) String pushByName);
 }
\ No newline at end of file
diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/factory/RemoteWlhyFallbackFactory.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/factory/RemoteWlhyFallbackFactory.java
index 430061dd5..b5f9d74d3 100644
--- a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/factory/RemoteWlhyFallbackFactory.java
+++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/factory/RemoteWlhyFallbackFactory.java
@@ -557,7 +557,7 @@ public class RemoteWlhyFallbackFactory implements FallbackFactory<WlhyServiceFei
             }
 
             @Override
-            public void updateExchangeRatePushStatus(String id, Integer pushStatus, String pushTime, Long pushBy) {
+            public void updateExchangeRatePushStatus(String id, Integer pushStatus, String pushTime, Long pushBy, String pushByName) {
 
             }
         };
diff --git a/mhd_oms/src/main/java/com/mhd/oms/application/service/exchangeRate/ExchangeRateApplicationService.java b/mhd_oms/src/main/java/com/mhd/oms/application/service/exchangeRate/ExchangeRateApplicationService.java
index 7a66e2eab..db4498b18 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/application/service/exchangeRate/ExchangeRateApplicationService.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/application/service/exchangeRate/ExchangeRateApplicationService.java
@@ -85,6 +85,7 @@ public class ExchangeRateApplicationService {
 
         LoginUser loginUser = SecurityUtils.getLoginUser();
         Long pushBy = loginUser != null ? loginUser.getUserid() : null;
+        String pushByName = loginUser != null ? loginUser.getUsername() : null;
         Long organizationId = loginUser != null ? loginUser.getUserPo().getOrganizationId() : null;
         Long topOrganizationId = loginUser != null ? loginUser.getUserPo().getTopOrganizationId() : null;
         String organizationName = loginUser != null ? loginUser.getUserPo().getOrganizationName() : null;
@@ -114,7 +115,7 @@ public class ExchangeRateApplicationService {
             gwLogMapper.insert(gwLog);
 
             // 更新为推送中
-            updateExchangeRatePushStatus(dto.getId(), 2, new Date(), pushBy);
+            updateExchangeRatePushStatus(dto.getId(), 2, new Date(), pushBy, pushByName);
 
             CloseableHttpClient httpClient = HttpClients.createDefault();
             HttpPost httpPost = new HttpPost(PUSH_API_URL);
@@ -130,12 +131,12 @@ public class ExchangeRateApplicationService {
 
                 if (response.getStatusLine().getStatusCode() == 200) {
                     gwLog.setStatus(2);
-                    updateExchangeRatePushStatus(dto.getId(), 3, new Date(), pushBy);
+                    updateExchangeRatePushStatus(dto.getId(), 3, new Date(), pushBy, pushByName);
                     successCount++;
                 } else {
                     gwLog.setStatus(3);
                     gwLog.setErrorMsg(responseString);
-                    updateExchangeRatePushStatus(dto.getId(), 4, new Date(), pushBy);
+                    updateExchangeRatePushStatus(dto.getId(), 4, new Date(), pushBy, pushByName);
                     failCount++;
                     failMsg.append("erpCurrCode:").append(dto.getErpCurrCode()).append("失败;");
                 }
@@ -145,7 +146,7 @@ public class ExchangeRateApplicationService {
                 gwLog.setStatus(3);
                 gwLog.setErrorMsg(e.getMessage());
                 gwLogMapper.updateById(gwLog);
-                updateExchangeRatePushStatus(dto.getId(), 4, new Date(), pushBy);
+                updateExchangeRatePushStatus(dto.getId(), 4, new Date(), pushBy, pushByName);
                 failCount++;
                 failMsg.append("erpCurrCode:").append(dto.getErpCurrCode()).append("异常:").append(e.getMessage()).append(";");
                 log.error("汇率推送异常: id={}, error={}", dto.getId(), e.getMessage());
@@ -165,10 +166,10 @@ public class ExchangeRateApplicationService {
         return AjaxResult.success(resultMsg);
     }
 
-    private void updateExchangeRatePushStatus(String id, Integer pushStatus, Date pushTime, Long pushBy) {
+    private void updateExchangeRatePushStatus(String id, Integer pushStatus, Date pushTime, Long pushBy, String pushByName) {
         try {
             String pushTimeStr = pushTime != null ? DateUtil.format(pushTime, "yyyy-MM-dd HH:mm:ss") : null;
-            wlhyServiceFeign.updateExchangeRatePushStatus(id, pushStatus, pushTimeStr, pushBy);
+            wlhyServiceFeign.updateExchangeRatePushStatus(id, pushStatus, pushTimeStr, pushBy, pushByName);
         } catch (Exception e) {
             log.error("更新汇率推送状态失败: id={}, error={}", id, e.getMessage());
         }