diff --git a/jianshui-admin/src/main/java/com/jianshui/api/controller/http/invoice/v1/InvoiceController.java b/jianshui-admin/src/main/java/com/jianshui/api/controller/http/invoice/v1/InvoiceController.java index ce35fb9..1eece6a 100644 --- a/jianshui-admin/src/main/java/com/jianshui/api/controller/http/invoice/v1/InvoiceController.java +++ b/jianshui-admin/src/main/java/com/jianshui/api/controller/http/invoice/v1/InvoiceController.java @@ -376,20 +376,18 @@ public class InvoiceController { } // 获得请求实例,并且进行扣费 - List result = new ArrayList<>(); String serviceKey = serviceManageService.getCompanyServiceSupplier("invoice", companyservice.getCompanyid()); serviceManageService.companyConsume("invoice", companyservice.getCompanyid()); billInfo.setServiceSupplierKey(serviceKey); IInvoiceApiService invoiceService = invoiceServiceFactory.getService(serviceKey); HXResponse tempResult = invoiceService.findReadInfoByHzqrdbh(billInfo, companyservice); - result.add(tempResult.getData()); - HXResponse hxResponse = new HXResponse(tempResult.getStatus(), tempResult.getMessage(), result); + String responseAdapterKey = serviceManageService.getResponseAdapterKey("invoice", companyservice.getCompanyid()); IInvoiceResponseService invoiceResponseService = invoiceResponseFactory.getService(responseAdapterKey); - Object query = invoiceResponseService.response(hxResponse, companyservice, "hzqrdFind"); + Object query = invoiceResponseService.response(tempResult, companyservice, ""); return query; } diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/ElephantInvoiceApiV6ServiceImpl.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/ElephantInvoiceApiV6ServiceImpl.java index b25ffd0..b0bf1cf 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/ElephantInvoiceApiV6ServiceImpl.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/ElephantInvoiceApiV6ServiceImpl.java @@ -1498,7 +1498,8 @@ public class ElephantInvoiceApiV6ServiceImpl implements IInvoiceApiService { invoice.setInvoiceDetailList(invoiceDetailList); invoiceMapper.batchInvoiceDetail(invoiceDetailList); - HXResponse response = new HXResponse("0000", "查询成功", invoice); + HXResponse response = new HXResponse("0000", "查询成功"); + response.put("data", invoice); return response; }