From e77897c59712082e683044e0d31c20735de98f1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com>
Date: Tue, 13 Jan 2026 18:48:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A7=94=E6=89=98=E6=96=B9=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E7=BB=93=E7=AE=97=E5=B8=81=E7=A7=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ReconciliationApplicationService.java     | 22 ++++++++++++++++++-
 .../feign/WlhyServiceFeign.java               | 11 +++++++++-
 2 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/mhd_finance/src/main/java/com/linke/finance/application/server/reconciliation/ReconciliationApplicationService.java b/mhd_finance/src/main/java/com/linke/finance/application/server/reconciliation/ReconciliationApplicationService.java
index 53f508732..98e5e06bb 100644
--- a/mhd_finance/src/main/java/com/linke/finance/application/server/reconciliation/ReconciliationApplicationService.java
+++ b/mhd_finance/src/main/java/com/linke/finance/application/server/reconciliation/ReconciliationApplicationService.java
@@ -2,6 +2,7 @@ package com.linke.finance.application.server.reconciliation;
 
 import com.alibaba.fastjson.JSONObject;
 import com.aliyun.dingtalkworkflow_1_0.models.StartProcessInstanceResponse;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.linke.finance.domain.businessDocument.entity.BusinessDocument;
 import com.linke.finance.domain.businessDocument.service.BusinessDocumentDomainService;
 import com.linke.finance.domain.reconciliation.entity.Reconciliation;
@@ -21,6 +22,7 @@ import com.linke.finance.infrastructure.feign.ProductServiceFeign;
 import com.linke.finance.infrastructure.feign.WlhyServiceFeign;
 import com.mhd.common.core.constant.SubjectConstants;
 import com.mhd.common.core.domain.dto.ReconciliationDTO;
+import com.mhd.common.core.domain.entity.TmsOrder;
 import com.mhd.common.core.domain.entity.Verification;
 import com.mhd.common.core.domain.po.OrganizationPo;
 import com.mhd.common.core.domain.po.UserPo;
@@ -29,6 +31,7 @@ import com.mhd.common.core.exception.ServiceException;
 import com.mhd.common.core.utils.OrderSequence;
 import com.mhd.common.core.utils.StringUtils;
 import com.mhd.common.core.utils.bean.BeanUtils;
+import com.mhd.common.core.utils.sms.Result;
 import com.mhd.common.core.web.domain.AjaxResult;
 import com.mhd.common.security.utils.SecurityUtils;
 import com.mhd.system.api.model.LoginUser;
@@ -156,8 +159,25 @@ public class ReconciliationApplicationService {
             }
         }
         return reconciliationPOS;*/
+        List<ReconciliationPO> reconciliationPOS = reconciliationDomainService.queryList(reconciliationDO);
+        for (ReconciliationPO reconciliationPO : reconciliationPOS) {
+            String innerNumber = reconciliationPO.getInnerNumber();
+            if (innerNumber != null && !innerNumber.trim().isEmpty()) {
+                ReconciliationDTO reconciliationDTO = new ReconciliationDTO();
+                reconciliationDTO.setInnerNumber(innerNumber);
+                Result<IPage<TmsOrder>> orderListByReconciliation = wlhyServiceFeign.getOrderListByReconciliation(reconciliationDTO, 1, 10);
+                if (orderListByReconciliation != null && orderListByReconciliation.getResult() != null) {
+                    IPage<TmsOrder> result = orderListByReconciliation.getResult();
+                    List<TmsOrder> records = result.getRecords();
+                    if (records != null && !records.isEmpty()) {
+                        TmsOrder tmsOrder = records.get(0);
+                        reconciliationPO.setSettlementCurrency(tmsOrder.getSettlementCurrency());
+                    }
+                }
+            }
+        }
 
-        return reconciliationDomainService.queryList(reconciliationDO);
+        return reconciliationPOS;
     }
 
     /**
diff --git a/mhd_finance/src/main/java/com/linke/finance/infrastructure/feign/WlhyServiceFeign.java b/mhd_finance/src/main/java/com/linke/finance/infrastructure/feign/WlhyServiceFeign.java
index 864ea2e89..b9dc4f341 100644
--- a/mhd_finance/src/main/java/com/linke/finance/infrastructure/feign/WlhyServiceFeign.java
+++ b/mhd_finance/src/main/java/com/linke/finance/infrastructure/feign/WlhyServiceFeign.java
@@ -1,6 +1,10 @@
 package com.linke.finance.infrastructure.feign;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mhd.common.core.domain.dto.ReconciliationDTO;
 import com.mhd.common.core.domain.dto.UserDriverDTO;
+import com.mhd.common.core.domain.entity.TmsOrder;
+import com.mhd.common.core.utils.sms.Result;
 import com.mhd.common.core.web.domain.AjaxResult;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -16,4 +20,9 @@ public interface WlhyServiceFeign {
      */
     @GetMapping("/ntocc/tmsOrder/getById")
     public AjaxResult getById(@RequestParam(name="id",required=true) Long id);
-}
+
+    @GetMapping(value = "/getOrderListByReconciliation")
+    public Result<IPage<TmsOrder>> getOrderListByReconciliation(ReconciliationDTO reconciliationDTO,
+                                                                @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+                                                                @RequestParam(name="pageSize", defaultValue="10") Integer pageSize);
+}
\ No newline at end of file