From f6b74473b9038b36fbc93ad3aa1a54fa601393d9 Mon Sep 17 00:00:00 2001 From: dongxiaoke <1910333201@qq.com> Date: Thu, 19 Dec 2024 14:57:49 +0800 Subject: [PATCH] =?UTF-8?q?feature:=20=E4=B8=8D=E5=8A=A8=E4=BA=A7=E9=94=80?= =?UTF-8?q?=E5=94=AE=E6=94=B9=E4=B8=BA=E5=A4=9A=E8=A1=8C=E6=98=8E=E7=BB=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../invoice/domain/dto/api/elephant/Qdtxx.java | 5 +++-- .../ElephantInvoiceApiV6ByInspurServiceImpl.java | 8 ++++---- .../impl/api/ElephantInvoiceApiV6ServiceImpl.java | 14 +++++++------- 3 files changed, 14 insertions(+), 13 deletions(-) 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 9bb7603..47d2bb0 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 @@ -43,11 +43,12 @@ public class Qdtxx { private List FJYSLIST; // 附加要素列表 private List HWYSLIST; // 货物运输 - private Bdcxsxx BDCXSXX; // 不动产销售信息 +// private List BDCXSXX; // 不动产销售信息 + private List BDCXSXXLIST; // 不动产销售信息 private Jzfwxx JZFWXX; // 建筑服务信息 private Bdczlxx BDCZLXX; // 建筑服务信息 private Jdcxx JDCXX; // 机动车信息 - + } diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/ElephantInvoiceApiV6ByInspurServiceImpl.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/ElephantInvoiceApiV6ByInspurServiceImpl.java index 17d9b88..c63bcf3 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/ElephantInvoiceApiV6ByInspurServiceImpl.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/ElephantInvoiceApiV6ByInspurServiceImpl.java @@ -224,7 +224,7 @@ public class ElephantInvoiceApiV6ByInspurServiceImpl implements IInvoiceApiServi if(billInfo.getBdcxsxxList() != null && !billInfo.getBdcxsxxList().isEmpty()){ - qdtxx.setBDCXSXX(billInfo.getBdcxsxxList().get(0)); // 不动产销售信息 + qdtxx.setBDCXSXXLIST(billInfo.getBdcxsxxList()); // 不动产销售信息 } if(billInfo.getJzfwList() != null && !billInfo.getJzfwList().isEmpty()){ qdtxx.setJZFWXX(billInfo.getJzfwList().get(0));// 建筑服务信息 @@ -243,7 +243,7 @@ public class ElephantInvoiceApiV6ByInspurServiceImpl implements IInvoiceApiServi if (CollectionUtils.isNotEmpty(qdtxx.getHWYSLIST())) { //GenerateQdHwysInvoice 货物运输 url = ElephantConstantsV6.GENERATE_QD_HWYS_INVOICE; - } else if (BeanUtil.isNotEmpty(qdtxx.getBDCXSXX())) { + } else if (BeanUtil.isNotEmpty(qdtxx.getBDCXSXXLIST())) { // GenerateQdBdcxsInvoice 不动产销售信息 url = ElephantConstantsV6.GENERATE_QD_BDCXS_INVOICE; } else if (BeanUtil.isNotEmpty(qdtxx.getJZFWXX())) { @@ -3645,7 +3645,7 @@ public class ElephantInvoiceApiV6ByInspurServiceImpl implements IInvoiceApiServi qdtxx.setHWYSLIST(billInfo.getHwysList()); // 货物运输 if(billInfo.getBdcxsxxList() != null && !billInfo.getBdcxsxxList().isEmpty()){ - qdtxx.setBDCXSXX(billInfo.getBdcxsxxList().get(0)); // 不动产销售信息 + qdtxx.setBDCXSXXLIST(billInfo.getBdcxsxxList()); // 不动产销售信息 } if(billInfo.getJzfwList() != null && !billInfo.getJzfwList().isEmpty()){ qdtxx.setJZFWXX(billInfo.getJzfwList().get(0));// 建筑服务信息 @@ -3665,7 +3665,7 @@ public class ElephantInvoiceApiV6ByInspurServiceImpl implements IInvoiceApiServi if (CollectionUtils.isNotEmpty(qdtxx.getHWYSLIST())) { //GenerateQdHwysInvoice 货物运输 url = ElephantConstantsV6.GENERATE_QD_HWYS_INVOICE; - } else if (BeanUtil.isNotEmpty(qdtxx.getBDCXSXX())) { + } else if (BeanUtil.isNotEmpty(qdtxx.getBDCXSXXLIST())) { // GenerateQdBdcxsInvoice 不动产销售信息 url = ElephantConstantsV6.GENERATE_QD_BDCXS_INVOICE; } else if (BeanUtil.isNotEmpty(qdtxx.getJZFWXX())) { 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 220030e..8991319 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 @@ -265,7 +265,7 @@ public class ElephantInvoiceApiV6ServiceImpl implements IInvoiceApiService { qdtxx.setHWYSLIST(billInfo.getHwysList()); // 货物运输 if (billInfo.getBdcxsxxList() != null && !billInfo.getBdcxsxxList().isEmpty()) { - qdtxx.setBDCXSXX(billInfo.getBdcxsxxList().get(0)); // 不动产销售信息 + qdtxx.setBDCXSXXLIST(billInfo.getBdcxsxxList()); // 不动产销售信息 } if (billInfo.getJzfwList() != null && !billInfo.getJzfwList().isEmpty()) { qdtxx.setJZFWXX(billInfo.getJzfwList().get(0));// 建筑服务信息 @@ -288,7 +288,7 @@ public class ElephantInvoiceApiV6ServiceImpl implements IInvoiceApiService { if (CollectionUtils.isNotEmpty(qdtxx.getHWYSLIST())) { //GenerateQdHwysInvoice 货物运输 url = ElephantConstantsV6.GENERATE_QD_HWYS_INVOICE; - } else if (BeanUtil.isNotEmpty(qdtxx.getBDCXSXX())) { + } else if (BeanUtil.isNotEmpty(qdtxx.getBDCXSXXLIST())) { // GenerateQdBdcxsInvoice 不动产销售信息 url = ElephantConstantsV6.GENERATE_QD_BDCXS_INVOICE; } else if (BeanUtil.isNotEmpty(qdtxx.getJZFWXX())) { @@ -384,7 +384,7 @@ public class ElephantInvoiceApiV6ServiceImpl implements IInvoiceApiService { queryBody.put("DDRQQ", "0"); // 订单日期止 queryBody.put("DDRQZ", "0");*/ - + // queryResult = ElephantUtils.sendRequest(ElephantConstantsV6.ADD_INVOICE_RESULT, JSONUtil.parse(queryBody)); try { queryResult = ElephantUtils.sendRequestWithoutTokenV6New(ElephantConstantsV6.ADD_INVOICE_RESULT_LOCALHOST, ElephantConstantsV6.ADD_INVOICE_RESULT_METHOD, JSONUtil.parse(queryBody), companyservice); @@ -517,7 +517,7 @@ public class ElephantInvoiceApiV6ServiceImpl implements IInvoiceApiService { queryBody.put("NSRSBH", companyservice.getSellertax()); queryBody.put("DDQQLSH", originBillInfo.getSystemOrderno()); - + debugLog("断点4", uuid, timestamp); @@ -3734,7 +3734,7 @@ public class ElephantInvoiceApiV6ServiceImpl implements IInvoiceApiService { qdtxx.setHWYSLIST(billInfo.getHwysList()); // 货物运输 if (billInfo.getBdcxsxxList() != null && !billInfo.getBdcxsxxList().isEmpty()) { - qdtxx.setBDCXSXX(billInfo.getBdcxsxxList().get(0)); // 不动产销售信息 + qdtxx.setBDCXSXXLIST(billInfo.getBdcxsxxList()); // 不动产销售信息 } if (billInfo.getJzfwList() != null && !billInfo.getJzfwList().isEmpty()) { qdtxx.setJZFWXX(billInfo.getJzfwList().get(0));// 建筑服务信息 @@ -3752,7 +3752,7 @@ public class ElephantInvoiceApiV6ServiceImpl implements IInvoiceApiService { if (CollectionUtils.isNotEmpty(qdtxx.getHWYSLIST())) { //GenerateQdHwysInvoice 货物运输 url = ElephantConstantsV6.GENERATE_QD_HWYS_INVOICE; - } else if (BeanUtil.isNotEmpty(qdtxx.getBDCXSXX())) { + } else if (BeanUtil.isNotEmpty(qdtxx.getBDCXSXXLIST())) { // GenerateQdBdcxsInvoice 不动产销售信息 url = ElephantConstantsV6.GENERATE_QD_BDCXS_INVOICE; } else if (BeanUtil.isNotEmpty(qdtxx.getJZFWXX())) { @@ -3849,7 +3849,7 @@ public class ElephantInvoiceApiV6ServiceImpl implements IInvoiceApiService { queryBody.put("DDRQQ", "0"); // 订单日期止 queryBody.put("DDRQZ", "0");*/ - + // queryResult = ElephantUtils.sendRequest(ElephantConstantsV6.ADD_INVOICE_RESULT, JSONUtil.parse(queryBody)); try { queryResult = ElephantUtils.sendRequestWithoutTokenV6New(ElephantConstantsV6.ADD_INVOICE_RESULT_LOCALHOST, ElephantConstantsV6.ADD_INVOICE_RESULT_METHOD, JSONUtil.parse(queryBody), companyservice);