From 428342ea25d3893307495c9de3b03ccf79b87c83 Mon Sep 17 00:00:00 2001 From: kk <1910333201@qq.com> Date: Tue, 9 Jan 2024 17:43:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8D=E5=8A=A8=E4=BA=A7=E7=A7=9F=E8=B5=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jianshui-admin/src/main/resources/application-dev.yml | 1 + .../jianshui/invoice/domain/dto/api/elephant/Qdtxx.java | 2 +- .../impl/api/ElephantInvoiceApiV6ServiceImpl.java | 9 ++++++--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/jianshui-admin/src/main/resources/application-dev.yml b/jianshui-admin/src/main/resources/application-dev.yml index f3d969d..90cd56e 100644 --- a/jianshui-admin/src/main/resources/application-dev.yml +++ b/jianshui-admin/src/main/resources/application-dev.yml @@ -94,6 +94,7 @@ elephant_invoice_file: http://dev.goldentaxcloud.com:8081/invoice/fileUrl/ # 大象V6数电对应平台地址 ele_url_v6: https://js.ele12.com/order-api #ele_url_v6: http://192.168.3.60:18108/order-api +#ele_url_v6: http://127.0.0.1:18108/order-api # 大象纸票服务对应平台地址 ele_url: http://140.143.226.17:8087/order-api #logstash: diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/elephant/Qdtxx.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/elephant/Qdtxx.java index 9fab00c..ff75945 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/elephant/Qdtxx.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/elephant/Qdtxx.java @@ -45,7 +45,7 @@ public class Qdtxx { private List HWYSLIST; // 货物运输 private List BDCXSXX; // 不动产销售信息 private Jzfwxx JZFWXX; // 建筑服务信息 - private List BDCZLXX; // 建筑服务信息 + private Bdczlxx BDCZLXX; // 建筑服务信息 } 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 4b23b34..51addfa 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 @@ -173,10 +173,13 @@ public class ElephantInvoiceApiV6ServiceImpl implements IInvoiceApiService { qdtxx.setFJYSLIST(billInfo.getFjyslist());// 附加要素列表 qdtxx.setHWYSLIST(billInfo.getHwysList()); // 货物运输 qdtxx.setBDCXSXX(billInfo.getBdcxsxxListt());// 不动产销售信息 - if(billInfo.getJzfwList().size() > 0 ){ + if(billInfo.getJzfwList() != null && billInfo.getJzfwList().size() > 0 ){ qdtxx.setJZFWXX(billInfo.getJzfwList().get(0));// 建筑服务信息 } - qdtxx.setBDCZLXX(billInfo.getBdczlxxList()); //不动产租赁信息 + if(billInfo.getBdczlxxList() != null && billInfo.getBdczlxxList().size() > 0 ){ + qdtxx.setBDCZLXX(billInfo.getBdczlxxList().get(0));// 不动产租赁信息 + } +// qdtxx.setBDCZLXX(billInfo.getBdczlxxList()); //不动产租赁信息 // 特殊票种地请求接口名转换 String url = ElephantConstantsV6.ADD_INVOICE_LOCALHOST; @@ -189,7 +192,7 @@ public class ElephantInvoiceApiV6ServiceImpl implements IInvoiceApiService { } else if (BeanUtil.isNotEmpty(qdtxx.getJZFWXX())) { // GenerateQdJzfwInvoice 建筑服务信息 url = ElephantConstantsV6.GENERATE_QD_JZFW_INVOICE; - } else if (CollectionUtils.isNotEmpty(qdtxx.getBDCZLXX())) { + } else if (BeanUtil.isNotEmpty(qdtxx.getBDCZLXX())) { // GenerateQdBdczlInvoice 不动产租赁信息 url = ElephantConstantsV6.GENERATE_QD_BDXZL_INVOICE; }