b2894lxlx/tms-erp-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🐛 A801-1 查询入参字段 data 更正为 queryParam

Browse Source
This commit is contained in:
刘泉佳
2026-09-20 19:51:43 +08:00
parent 74512e6b66
commit f9433cbc78
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/FormalSettlementServiceImpl.java
+1 -1
View File
@@ -1416,7 +1416,7 @@ public class FormalSettlementServiceImpl extends BaseServiceImpl<FormalSettlemen
data.setExpenseStatus(expenseStatus.trim()); data.setExpenseStatus(expenseStatus.trim());
} }
BfiInvoicePoolQueryDTO param = new BfiInvoicePoolQueryDTO(); BfiInvoicePoolQueryDTO param = new BfiInvoicePoolQueryDTO();
param.setData(data); param.setQueryParam(data);
List<BfiInvoicePoolVO> poolInvoices = bfiService.queryInvoicePool(param); List<BfiInvoicePoolVO> poolInvoices = bfiService.queryInvoicePool(param);
List<FormalSettlementInvoicePoolVO> invoices = poolInvoices.stream() List<FormalSettlementInvoicePoolVO> invoices = poolInvoices.stream()
.filter(poolInvoice -> !"1".equals(poolInvoice.getDelete())) .filter(poolInvoice -> !"1".equals(poolInvoice.getDelete()))
blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiInvoicePoolQueryDTO.java
Vendored
+2 -2
View File
@@ -52,7 +52,7 @@ public class BfiInvoicePoolQueryDTO implements Serializable {
*/ */
private String messageId; private String messageId;
/** /**
* 【必填】查询条件主体 * 【必填】查询参数主体
*/ */
private BfiInvoicePoolQueryDataDTO data; private BfiInvoicePoolQueryDataDTO queryParam;
} }
blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/service/impl/BfiServiceImpl.java
Vendored
+2 -2
View File
@@ -485,12 +485,12 @@ public class BfiServiceImpl implements IBfiService {
@Override @Override
public List<BfiInvoicePoolVO> queryInvoicePool(BfiInvoicePoolQueryDTO param) { public List<BfiInvoicePoolVO> queryInvoicePool(BfiInvoicePoolQueryDTO param) {
if (param == null || param.getData() == null) { if (param == null || param.getQueryParam() == null) {
throw new BfiException("查询BFI全票池发票失败，查询参数不能为空"); throw new BfiException("查询BFI全票池发票失败，查询参数不能为空");
} }
param.setMessageType(BfiConstant.MESSAGE_TYPE_INVOICE_QUERY); param.setMessageType(BfiConstant.MESSAGE_TYPE_INVOICE_QUERY);
// A801-1 rim 契约仅返回当前页数据且无总数，统一通过通用翻页工具取全量，由调用方自行分页 // A801-1 rim 契约仅返回当前页数据且无总数，统一通过通用翻页工具取全量，由调用方自行分页
BfiInvoicePoolQueryDataDTO data = param.getData(); BfiInvoicePoolQueryDataDTO data = param.getQueryParam();
long start = System.currentTimeMillis(); long start = System.currentTimeMillis();
log.info("调用BFI接口 全票池发票查询开始 pageSize：{}", data.getPageSize()); log.info("调用BFI接口 全票池发票查询开始 pageSize：{}", data.getPageSize());
List<BfiInvoicePoolVO> invoices = BfiUtil.queryAllPages(pageNo -> { List<BfiInvoicePoolVO> invoices = BfiUtil.queryAllPages(pageNo -> {
blade-third-party-api/blade-bfi-api/src/test/java/org/springblade/thirdparty/bfi/service/BfiServiceImplTest.java
Vendored
+1 -1
View File
@@ -533,7 +533,7 @@ class BfiServiceImplTest {
data.setInvoiceNo("25532000000044538098"); data.setInvoiceNo("25532000000044538098");
data.setPageSize(500); data.setPageSize(500);
BfiInvoicePoolQueryDTO param = new BfiInvoicePoolQueryDTO(); BfiInvoicePoolQueryDTO param = new BfiInvoicePoolQueryDTO();
param.setData(data); param.setQueryParam(data);
List<BfiInvoicePoolVO> rows = service.queryInvoicePool(param); List<BfiInvoicePoolVO> rows = service.queryInvoicePool(param);
assertEquals(1, rows.size()); assertEquals(1, rows.size());
} }