不动产租赁

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:

jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/elephant/Qdtxx.java

@@ -45,7 +45,7 @@ public class Qdtxx {
     private List<Hwys> HWYSLIST; // 货物运输
     private List<Bdcxsxx> BDCXSXX; // 不动产销售信息
     private Jzfwxx JZFWXX; // 建筑服务信息
-    private List<Bdczlxx> BDCZLXX; // 建筑服务信息
+    private Bdczlxx BDCZLXX; // 建筑服务信息
 
     
 }

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;
         }