diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/constant/elephant/ElephantConstantsV6.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/constant/elephant/ElephantConstantsV6.java index c0dde99..162d48d 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/constant/elephant/ElephantConstantsV6.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/constant/elephant/ElephantConstantsV6.java @@ -34,10 +34,10 @@ public class ElephantConstantsV6 { public static String ADD_INVOICE_LOCALHOST = "/invoice/api/v6/GenerateQdInvoice"; public static String ADD_INVOICE_METHOD = "GenerateQdInvoice"; - public static String GENERATE_QD_HWYS_INVOICE = "GenerateQdHwysInvoice"; - public static String GENERATE_QD_BDCXS_INVOICE = "GenerateQdBdcxsInvoice"; - public static String GENERATE_QD_JZFW_INVOICE = "GenerateQdJzfwInvoice"; - public static String GENERATE_QD_BDXZL_INVOICE = "GenerateQdBdczlInvoice"; + public static String GENERATE_QD_HWYS_INVOICE = "/invoice/api/v6/GenerateQdHwysInvoice"; + public static String GENERATE_QD_BDCXS_INVOICE = "/invoice/api/v6/GenerateQdBdcxsInvoice"; + public static String GENERATE_QD_JZFW_INVOICE = "/invoice/api/v6/GenerateQdJzfwInvoice"; + public static String GENERATE_QD_BDXZL_INVOICE = "/invoice/api/v6/GenerateQdBdczlInvoice"; // 发票开票结果拉取 public static String ADD_INVOICE_RESULT = "order-api/order-api/v6/GetOrderInfoAndInvoiceInfo"; diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/BillInfo.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/BillInfo.java index ae83a2e..9a978d2 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/BillInfo.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/BillInfo.java @@ -256,6 +256,10 @@ public class BillInfo extends BaseEntity @ApiModelProperty(value = "办税人身份证号") private String bsrysfzjhm; + @TableField(exist=false) + @ApiModelProperty(value = "特定要素") + private String tdys; + @TableField(exist=false) @ApiModelProperty(value = "*地区编码(参考码表)") @@ -442,6 +446,14 @@ public class BillInfo extends BaseEntity /** 机动车发票票面版式标志*/ private String infoClientAddressPhone; + public String getTdys() { + return tdys; + } + + public void setTdys(String tdys) { + this.tdys = tdys; + } + public String getEnginNo() { return enginNo; } diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/adapter/request/aisino_jn/HxBillInfoDTO.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/adapter/request/aisino_jn/HxBillInfoDTO.java index 9917232..77814aa 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/adapter/request/aisino_jn/HxBillInfoDTO.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/adapter/request/aisino_jn/HxBillInfoDTO.java @@ -435,6 +435,9 @@ public class HxBillInfoDTO extends BillInfo { @ApiModelProperty(value = "特定类型代码") private String tdyslxdm; + @ApiModelProperty(value = "特定要素") + private String tdys; + @ApiModelProperty(value = "附加信息名称") private String fjxxmc; diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/elephant/DDZXX.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/elephant/DDZXX.java index 32289a9..a13f690 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/elephant/DDZXX.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/elephant/DDZXX.java @@ -12,10 +12,21 @@ import java.util.List; */ public class DDZXX { + private Qdtxx QDTXX; + private DDTXX DDTXX; // 订单头信息 private ESCTXX ESCTXX; // 二手车头信息 private JDCTXX JDCTXX; // 机动车头信息 private List DDMXXX; // 订单明细信息 + + + public Qdtxx getQDTXX() { + return QDTXX; + } + + public void setQDTXX(Qdtxx QDTXX) { + this.QDTXX = QDTXX; + } public void setDDTXX(DDTXX DDTXX) { this.DDTXX = DDTXX; } diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/elephant/ElephantInvoiceAddDTO.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/elephant/ElephantInvoiceAddDTO.java index f0edfc6..0952cb4 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/elephant/ElephantInvoiceAddDTO.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/elephant/ElephantInvoiceAddDTO.java @@ -13,16 +13,6 @@ public class ElephantInvoiceAddDTO { private DDPCXX DDPCXX; // 发票头信息 private List DDZXX; // 发票明细 - private Qdtxx QDTXX; - - - public Qdtxx getQDTXX() { - return QDTXX; - } - - public void setQDTXX(Qdtxx QDTXX) { - this.QDTXX = QDTXX; - } public void setDDPCXX(DDPCXX DDPCXX) { this.DDPCXX = DDPCXX; 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 957ba83..9fab00c 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 @@ -44,7 +44,7 @@ public class Qdtxx { private List FJYSLIST; // 附加要素列表 private List HWYSLIST; // 货物运输 private List BDCXSXX; // 不动产销售信息 - private List JZFWXX; // 建筑服务信息 + private Jzfwxx JZFWXX; // 建筑服务信息 private List BDCZLXX; // 建筑服务信息 diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/ElephantInvoiceApiServiceImpl.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/ElephantInvoiceApiServiceImpl.java index 69c6dfc..716cbfe 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/ElephantInvoiceApiServiceImpl.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/ElephantInvoiceApiServiceImpl.java @@ -167,8 +167,9 @@ public class ElephantInvoiceApiServiceImpl implements IInvoiceApiService { qdtxx.setFJYSLIST(billInfo.getFjyslist());// 附加要素列表 qdtxx.setHWYSLIST(billInfo.getHwysList()); // 货物运输 qdtxx.setBDCXSXX(billInfo.getBdcxsxxListt());// 不动产销售信息 - qdtxx.setJZFWXX(billInfo.getJzfwList());// 建筑服务信息 - + if(billInfo.getJzfwList().size()>0){ + qdtxx.setJZFWXX(billInfo.getJzfwList().get(0));// 建筑服务信息 + } // 开始处理详情 List details = billInfo.getBillDetailList(); @@ -185,11 +186,11 @@ public class ElephantInvoiceApiServiceImpl implements IInvoiceApiService { DDZXX ddzxx = new DDZXX(); ddzxx.setDDTXX(ddtxx); ddzxx.setDDMXXX(ddmxxxList); + // 全电头信息 + ddzxx.setQDTXX(qdtxx); List ddzxxes = new ArrayList<>(); ddzxxes.add(ddzxx); elephantInvoiceAddDTO.setDDZXX(ddzxxes); - // 全电头信息 - elephantInvoiceAddDTO.setQDTXX(qdtxx); // JSONObject result = JSONObject.parseObject("{\"zipCode\":\"0\",\"entCode\":\"91370102MA3UD2FG21\",\"dataExchangeId\":\"20220328140706911955546286280593\",\"encryptCode\":\"0\",\"returnStateInfo\":{\"returnCode\":\"0000\",\"returnMessage\":\"5aSE55CG5oiQ5YqfIQ==\"},\"content\":\"eyJERFFRUENIIjoiODgyOWNmNWUtNDAyYS00NWZkLWFiYmEtMzlkMjlhOWMzMjMzIiwiWlRETSI6IjAwOTk5OSIsIlpUWFgiOiLkvIHkuJrmnKrphY3nva7nqI7mjqforr7lpIcifQ==\"}"); // if (!CommonUtils.isDevMode()) { 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 b382c77..e77bd37 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 @@ -169,13 +169,15 @@ public class ElephantInvoiceApiV6ServiceImpl implements IInvoiceApiService { Qdtxx qdtxx = BeanUtil.copyProperties(billInfo, Qdtxx.class); // 2023/9/22 特定要素类型代码处理 - qdtxx.setTdys(billInfo.getTdyslxdm()); + qdtxx.setTdys(billInfo.getTdys()); qdtxx.setQydm(billInfo.getDqbm()); qdtxx.setFJYSLIST(billInfo.getFjyslist());// 附加要素列表 qdtxx.setHWYSLIST(billInfo.getHwysList()); // 货物运输 qdtxx.setBDCXSXX(billInfo.getBdcxsxxListt());// 不动产销售信息 - qdtxx.setJZFWXX(billInfo.getJzfwList());// 建筑服务信息 + if(billInfo.getJzfwList().size() > 0 ){ + qdtxx.setJZFWXX(billInfo.getJzfwList().get(0));// 建筑服务信息 + } qdtxx.setBDCZLXX(billInfo.getBdczlxxList()); //不动产租赁信息 // 特殊票种地请求接口名转换 @@ -186,7 +188,7 @@ public class ElephantInvoiceApiV6ServiceImpl implements IInvoiceApiService { } else if (CollectionUtils.isNotEmpty(qdtxx.getBDCXSXX())) { // GenerateQdBdcxsInvoice 不动产销售信息 url = ElephantConstantsV6.GENERATE_QD_BDCXS_INVOICE; - } else if (CollectionUtils.isNotEmpty(qdtxx.getJZFWXX())) { + } else if (BeanUtil.isNotEmpty(qdtxx.getJZFWXX())) { // GenerateQdJzfwInvoice 建筑服务信息 url = ElephantConstantsV6.GENERATE_QD_JZFW_INVOICE; } else if (CollectionUtils.isNotEmpty(qdtxx.getBDCZLXX())) { @@ -209,11 +211,12 @@ public class ElephantInvoiceApiV6ServiceImpl implements IInvoiceApiService { DDZXX ddzxx = new DDZXX(); ddzxx.setDDTXX(ddtxx); ddzxx.setDDMXXX(ddmxxxList); + // 全电头信息 + ddzxx.setQDTXX(qdtxx); List ddzxxes = new ArrayList<>(); ddzxxes.add(ddzxx); elephantInvoiceAddDTO.setDDZXX(ddzxxes); - // 全电头信息 - elephantInvoiceAddDTO.setQDTXX(qdtxx); + AjaxResult queryResult = null; try { diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/utils/InvoiceTest.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/utils/InvoiceTest.java index 207c545..f9fac43 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/utils/InvoiceTest.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/utils/InvoiceTest.java @@ -365,7 +365,7 @@ public class InvoiceTest { System.out.println(m); System.out.println("------------------------------------------------"); System.out.println("-------------------发票查询(流水号)-----------------------------"); - String query = "{\"identity\":\"1235\",\"fpqqlsh\":['cc8291ae749240e79f90eb86756fe583'],\"isOfferInvoiceDetail\":\"true\"}"; + String query = "{\"identity\":\"1546\",\"fpqqlsh\":['23fdef4835f94bdcbb51aa7dc166792d'],\"isOfferInvoiceDetail\":\"true\"}"; System.out.println(query);