diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/FormalSettlementServiceImpl.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/FormalSettlementServiceImpl.java index e5202aad..dc5d3b30 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/FormalSettlementServiceImpl.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/FormalSettlementServiceImpl.java @@ -1416,7 +1416,7 @@ public class FormalSettlementServiceImpl extends BaseServiceImpl poolInvoices = bfiService.queryInvoicePool(param); List invoices = poolInvoices.stream() .filter(poolInvoice -> !"1".equals(poolInvoice.getDelete())) diff --git a/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiInvoicePoolQueryDTO.java b/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiInvoicePoolQueryDTO.java index 33db138e..c7737e12 100644 --- a/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiInvoicePoolQueryDTO.java +++ b/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiInvoicePoolQueryDTO.java @@ -52,7 +52,7 @@ public class BfiInvoicePoolQueryDTO implements Serializable { */ private String messageId; /** - * 【必填】查询条件主体 + * 【必填】查询参数主体 */ - private BfiInvoicePoolQueryDataDTO data; + private BfiInvoicePoolQueryDataDTO queryParam; } diff --git a/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/service/impl/BfiServiceImpl.java b/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/service/impl/BfiServiceImpl.java index 0613bdd1..76f5b01b 100644 --- a/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/service/impl/BfiServiceImpl.java +++ b/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/service/impl/BfiServiceImpl.java @@ -485,12 +485,12 @@ public class BfiServiceImpl implements IBfiService { @Override public List queryInvoicePool(BfiInvoicePoolQueryDTO param) { - if (param == null || param.getData() == null) { + if (param == null || param.getQueryParam() == null) { throw new BfiException("查询BFI全票池发票失败,查询参数不能为空"); } param.setMessageType(BfiConstant.MESSAGE_TYPE_INVOICE_QUERY); // A801-1 rim 契约仅返回当前页数据且无总数,统一通过通用翻页工具取全量,由调用方自行分页 - BfiInvoicePoolQueryDataDTO data = param.getData(); + BfiInvoicePoolQueryDataDTO data = param.getQueryParam(); long start = System.currentTimeMillis(); log.info("调用BFI接口 全票池发票查询开始 pageSize:{}", data.getPageSize()); List invoices = BfiUtil.queryAllPages(pageNo -> { diff --git a/blade-third-party-api/blade-bfi-api/src/test/java/org/springblade/thirdparty/bfi/service/BfiServiceImplTest.java b/blade-third-party-api/blade-bfi-api/src/test/java/org/springblade/thirdparty/bfi/service/BfiServiceImplTest.java index 94dfaaf2..78a60659 100644 --- a/blade-third-party-api/blade-bfi-api/src/test/java/org/springblade/thirdparty/bfi/service/BfiServiceImplTest.java +++ b/blade-third-party-api/blade-bfi-api/src/test/java/org/springblade/thirdparty/bfi/service/BfiServiceImplTest.java @@ -533,7 +533,7 @@ class BfiServiceImplTest { data.setInvoiceNo("25532000000044538098"); data.setPageSize(500); BfiInvoicePoolQueryDTO param = new BfiInvoicePoolQueryDTO(); - param.setData(data); + param.setQueryParam(data); List rows = service.queryInvoicePool(param); assertEquals(1, rows.size()); }