From ece29d5f465550e2b67ae35864bd9bdc52311080 Mon Sep 17 00:00:00 2001
From: zhaoqing <3160641494@qq.com>
Date: Thu, 18 Jun 2026 10:25:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BC=81=E4=B8=9A=E5=B8=81?=
 =?UTF-8?q?=E5=80=BC-=E5=90=84=E7=BB=84=E7=BB=87=E7=8B=AC=E7=AB=8B?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
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            | 14 +++++++-------
 .../dto/exchangeRate/ExchangeRateDTO.java          |  6 ++++++
 4 files changed, 17 insertions(+), 10 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 7b29982a5..2a035bb27 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
@@ -546,11 +546,12 @@ public interface WlhyServiceFeign {
                                                @RequestParam(name="organizationId", required = false) String organizationId);
 
 
-    @ApiOperation("汇率-更新推送状态")
+    @ApiOperation("汇率-更新推送状态（按组织独立推送）")
     @PostMapping("/ntocc/tmsSettlementExchangeRate/updatePushStatus")
     void updateExchangeRatePushStatus(@RequestParam("id") String id,
                                       @RequestParam("pushStatus") Integer pushStatus,
                                       @RequestParam(name="pushTime",required = false) String pushTime,
                                       @RequestParam(name="pushBy",required = false) Long pushBy,
-                                      @RequestParam(name="pushByName",required = false) String pushByName);
+                                      @RequestParam(name="pushByName",required = false) String pushByName,
+                                      @RequestParam("organizationId") Long organizationId);
 }
\ 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 b5f9d74d3..3a989887e 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, String pushByName) {
+            public void updateExchangeRatePushStatus(String id, Integer pushStatus, String pushTime, Long pushBy, String pushByName, Long organization) {
 
             }
         };
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 e691b533d..47dc4008d 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
@@ -133,7 +133,7 @@ public class ExchangeRateApplicationService {
             gwLogMapper.insert(gwLog);
 
             // 更新为推送中
-            updateExchangeRatePushStatus(dto.getId(), 2, new Date(), pushBy, pushByName);
+            updateExchangeRatePushStatus(dto.getId(), 2, new Date(), pushBy, pushByName, organizationId, organizationName);
 
             CloseableHttpClient httpClient = HttpClients.createDefault();
             HttpPost httpPost = new HttpPost(pushUrl);
@@ -156,19 +156,19 @@ public class ExchangeRateApplicationService {
 
                     if (dataCode != null && dataCode == 200) {  // 业务也成功
                         gwLog.setStatus(2);
-                        updateExchangeRatePushStatus(dto.getId(), 3, new Date(), pushBy, pushByName);
+                        updateExchangeRatePushStatus(dto.getId(), 3, new Date(), pushBy, pushByName, organizationId, organizationName);
                         successCount++;
                     } else {
                         gwLog.setStatus(3);
                         gwLog.setErrorMsg(responseString);
-                        updateExchangeRatePushStatus(dto.getId(), 4, new Date(), pushBy, pushByName);
+                        updateExchangeRatePushStatus(dto.getId(), 4, new Date(), pushBy, pushByName, organizationId, organizationName);
                         failCount++;
                         failMsg.append("erpCurrCode:").append(dto.getErpCurrCode()).append("失败;");
                     }
                 } else {
                     gwLog.setStatus(3);
                     gwLog.setErrorMsg(responseString);
-                    updateExchangeRatePushStatus(dto.getId(), 4, new Date(), pushBy, pushByName);
+                    updateExchangeRatePushStatus(dto.getId(), 4, new Date(), pushBy, pushByName, organizationId, organizationName);
                     failCount++;
                     failMsg.append("erpCurrCode:").append(dto.getErpCurrCode()).append("失败;");
                 }
@@ -179,7 +179,7 @@ public class ExchangeRateApplicationService {
                 gwLog.setErrorMsg(e.getMessage());
                 gwLog.setResponseBody("请求异常：" + e.getMessage());
                 gwLogMapper.updateById(gwLog);
-                updateExchangeRatePushStatus(dto.getId(), 4, new Date(), pushBy, pushByName);
+                updateExchangeRatePushStatus(dto.getId(), 4, new Date(), pushBy, pushByName, organizationId, organizationName);
                 failCount++;
                 failMsg.append("erpCurrCode:").append(dto.getErpCurrCode()).append("异常:").append(e.getMessage()).append(";");
                 log.error("汇率推送异常: id={}, error={}", dto.getId(), e.getMessage());
@@ -199,10 +199,10 @@ public class ExchangeRateApplicationService {
         return AjaxResult.success(resultMsg);
     }
 
-    private void updateExchangeRatePushStatus(String id, Integer pushStatus, Date pushTime, Long pushBy, String pushByName) {
+    private void updateExchangeRatePushStatus(String id, Integer pushStatus, Date pushTime, Long pushBy, String pushByName, Long organizationId, String organizationName) {
         try {
             String pushTimeStr = pushTime != null ? DateUtil.format(pushTime, "yyyy-MM-dd HH:mm:ss") : null;
-            wlhyServiceFeign.updateExchangeRatePushStatus(id, pushStatus, pushTimeStr, pushBy, pushByName);
+            wlhyServiceFeign.updateExchangeRatePushStatus(id, pushStatus, pushTimeStr, pushBy, pushByName, organizationId);
         } catch (Exception e) {
             log.error("更新汇率推送状态失败: id={}, error={}", id, e.getMessage());
         }
diff --git a/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/exchangeRate/ExchangeRateDTO.java b/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/exchangeRate/ExchangeRateDTO.java
index 6d76960aa..3abfe5572 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/exchangeRate/ExchangeRateDTO.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/exchangeRate/ExchangeRateDTO.java
@@ -16,4 +16,10 @@ public class ExchangeRateDTO {
 
     @ApiModelProperty(value = "币种名称（ERP名称）")
     private String erpCurrName;
+
+    @ApiModelProperty(value = "组织ID")
+    private Long organizationId;
+
+    @ApiModelProperty(value = "组织名称")
+    private String organizationName;
 }