From 77506c296096110a05d3929d6968f7d2a508f3fb Mon Sep 17 00:00:00 2001 From: dongxiaoke <1910333201@qq.com> Date: Mon, 18 Sep 2023 11:18:07 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E7=94=B5=E5=BC=80=E5=85=B7=E3=80=81?= =?UTF-8?q?=E5=86=B2=E7=BA=A2=E6=8E=A5=E5=8F=A3=E5=8D=87=E7=BA=A7V6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jianshui/invoice/domain/BillInfo.java | 45 ++++++++++++++++--- .../api/elephant/ElephantInvoiceAddDTO.java | 11 +++++ .../domain/dto/api/elephant/Qdtxx.java | 9 ++-- .../api/ElephantInvoiceApiServiceImpl.java | 13 ++++-- .../invoice/utils/elephant/ElephantUtils.java | 1 + 5 files changed, 65 insertions(+), 14 deletions(-) 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 975b5e5..d80b3b9 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 @@ -9,9 +9,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; import com.jianshui.common.annotation.Excel; import com.jianshui.common.core.domain.BaseEntity; -import com.jianshui.invoice.domain.dto.api.elephant.addInvoice.Bdczlxx; -import com.jianshui.invoice.domain.dto.api.elephant.addInvoice.Fjys; -import com.jianshui.invoice.domain.dto.api.elephant.addInvoice.Hwys; +import com.jianshui.invoice.domain.dto.api.elephant.addInvoice.*; import io.swagger.annotations.ApiModelProperty; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -380,22 +378,55 @@ public class BillInfo extends BaseEntity @TableField(exist=false) private List fjysList; // 附加要素列表 - // @TableField(exist=false) - private List hwysList; // 货物运输 + @TableField(exist=false) private List bdczlxxList; // 不动产租赁 + @TableField(exist=false) + private List hwysList; // 货物运输 + @TableField(exist=false) + private List bdcxsxxListt; // 不动产销售信息 + @TableField(exist=false) + private List jzfwList; // 建筑服务信息 + public List getFjysList() { + return fjysList; + } + public void setFjysList(List fjysList) { + this.fjysList = fjysList; + } + public List getBdczlxxList() { + return bdczlxxList; + } + public void setBdczlxxList(List bdczlxxList) { + this.bdczlxxList = bdczlxxList; + } + public List getHwysList() { + return hwysList; + } + public void setHwysList(List hwysList) { + this.hwysList = hwysList; + } + public List getBdcxsxxListt() { + return bdcxsxxListt; + } + public void setBdcxsxxListt(List bdcxsxxListt) { + this.bdcxsxxListt = bdcxsxxListt; + } + public List getJzfwList() { + return jzfwList; + } - - + public void setJzfwList(List jzfwList) { + this.jzfwList = jzfwList; + } public String getTdys() { return tdys; 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 55a212b..f0edfc6 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,6 +13,17 @@ 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 e2a3260..4b1fc50 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 @@ -1,7 +1,7 @@ package com.jianshui.invoice.domain.dto.api.elephant; -import com.jianshui.invoice.domain.dto.api.elephant.addInvoice.Fjys; +import com.jianshui.invoice.domain.dto.api.elephant.addInvoice.*; import lombok.Data; import java.util.List; @@ -41,7 +41,10 @@ public class Qdtxx { private String ysxwfsd; // 应税行为发生地 - private List fjyslist; // 附加要素列表 - + private List FJYSLIST; // 附加要素列表 + private List HWYSLIST; // 货物运输 + private List BDCXSXX; // 不动产销售信息 + private List JZFWXX; // 建筑服务信息 + } 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 34c5b41..560ee30 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 @@ -26,7 +26,10 @@ import com.jianshui.invoice.domain.dto.adapter.response.RedInfoDTO; import com.jianshui.invoice.domain.dto.adapter.response.RedInfoDetailDTO; import com.jianshui.invoice.domain.dto.api.*; import com.jianshui.invoice.domain.dto.api.elephant.*; +import com.jianshui.invoice.domain.dto.api.elephant.addInvoice.Bdcxsxx; import com.jianshui.invoice.domain.dto.api.elephant.addInvoice.Fjys; +import com.jianshui.invoice.domain.dto.api.elephant.addInvoice.Hwys; +import com.jianshui.invoice.domain.dto.api.elephant.addInvoice.Jzfwxx; import com.jianshui.invoice.domain.ele.EleNewMessage; import com.jianshui.invoice.domain.ele.EleOuterMessage; import com.jianshui.invoice.domain.ele.HZSQDMessage; @@ -161,6 +164,10 @@ public class ElephantInvoiceApiServiceImpl implements IInvoiceApiService { qdtxx.setFjyslist(fjysList); }*/ qdtxx.setQydm(billInfo.getDqbm()); + qdtxx.setFJYSLIST(billInfo.getFjyslist());// 附加要素列表 + qdtxx.setHWYSLIST(billInfo.getHwysList()); // 货物运输 + qdtxx.setBDCXSXX(billInfo.getBdcxsxxListt());// 不动产销售信息 + qdtxx.setJZFWXX(billInfo.getJzfwList());// 建筑服务信息 // 开始处理详情 @@ -172,10 +179,6 @@ public class ElephantInvoiceApiServiceImpl implements IInvoiceApiService { ddmxxxList.add(ddmxxx); } - //kk TODO : 2023/9/16 请求报文封装 - - - // 开始封装请求报文 ElephantInvoiceAddDTO elephantInvoiceAddDTO = new ElephantInvoiceAddDTO(); elephantInvoiceAddDTO.setDDPCXX(ddpcxx); @@ -185,6 +188,8 @@ public class ElephantInvoiceApiServiceImpl implements IInvoiceApiService { 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/utils/elephant/ElephantUtils.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/utils/elephant/ElephantUtils.java index 705e62d..9f72d81 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/utils/elephant/ElephantUtils.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/utils/elephant/ElephantUtils.java @@ -388,6 +388,7 @@ public class ElephantUtils { // 大象v6调用方法（获取结果处理） DxhyInterfaceResponse dxhyInterfaceResponse = InvokeDxhyApi.dxhyInterfaceInvoke(dxhyInterfaceRequest); log.info("请求成功，结果{}",JSONUtil.toJsonStr(dxhyInterfaceResponse)); + return dxhyInterfaceResponse; }