From 8f0d4ed687770418ee3c9f4acd3db550699f6bd1 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:54:18 +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 --- .../reconciliation/ReconciliationApplicationService.java | 5 +++-- .../finance/infrastructure/feign/WlhyServiceFeign.java | 9 +++++---- 2 files changed, 8 insertions(+), 6 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 98e5e06bb..2e5629f26 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 @@ -3,6 +3,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.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.linke.finance.domain.businessDocument.entity.BusinessDocument; import com.linke.finance.domain.businessDocument.service.BusinessDocumentDomainService; import com.linke.finance.domain.reconciliation.entity.Reconciliation; @@ -165,9 +166,9 @@ public class ReconciliationApplicationService { if (innerNumber != null && !innerNumber.trim().isEmpty()) { ReconciliationDTO reconciliationDTO = new ReconciliationDTO(); reconciliationDTO.setInnerNumber(innerNumber); - Result> orderListByReconciliation = wlhyServiceFeign.getOrderListByReconciliation(reconciliationDTO, 1, 10); + Result> orderListByReconciliation = wlhyServiceFeign.getOrderListByReconciliation(reconciliationDTO, 1, 10); if (orderListByReconciliation != null && orderListByReconciliation.getResult() != null) { - IPage result = orderListByReconciliation.getResult(); + Page result = orderListByReconciliation.getResult(); List records = result.getRecords(); if (records != null && !records.isEmpty()) { TmsOrder tmsOrder = records.get(0); 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 b9dc4f341..326cc6b52 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,7 @@ package com.linke.finance.infrastructure.feign; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.mhd.common.core.domain.dto.ReconciliationDTO; import com.mhd.common.core.domain.dto.UserDriverDTO; import com.mhd.common.core.domain.entity.TmsOrder; @@ -21,8 +22,8 @@ public interface WlhyServiceFeign { @GetMapping("/ntocc/tmsOrder/getById") public AjaxResult getById(@RequestParam(name="id",required=true) Long id); - @GetMapping(value = "/getOrderListByReconciliation") - public Result> getOrderListByReconciliation(ReconciliationDTO reconciliationDTO, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize); + @GetMapping(value = "/ntocc/outBoundSummary/getOrderListByReconciliation") + public Result> getOrderListByReconciliation(ReconciliationDTO reconciliationDTO, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize); } \ No newline at end of file