数电开具、冲红接口升级V6

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<Fjys> fjysList; // 附加要素列表
 
-    // @TableField(exist=false)
-    private List<Hwys> hwysList; // 货物运输
+    @TableField(exist=false)
     private List<Bdczlxx> bdczlxxList; // 不动产租赁
+    @TableField(exist=false)
+    private List<Hwys> hwysList; // 货物运输
+    @TableField(exist=false)
+    private List<Bdcxsxx> bdcxsxxListt; // 不动产销售信息
+    @TableField(exist=false)
+    private List<Jzfwxx> jzfwList; // 建筑服务信息
 
 
+    public List<Fjys> getFjysList() {
+        return fjysList;
+    }
 
+    public void setFjysList(List<Fjys> fjysList) {
+        this.fjysList = fjysList;
+    }
 
+    public List<Bdczlxx> getBdczlxxList() {
+        return bdczlxxList;
+    }
 
+    public void setBdczlxxList(List<Bdczlxx> bdczlxxList) {
+        this.bdczlxxList = bdczlxxList;
+    }
 
+    public List<Hwys> getHwysList() {
+        return hwysList;
+    }
 
+    public void setHwysList(List<Hwys> hwysList) {
+        this.hwysList = hwysList;
+    }
 
+    public List<Bdcxsxx> getBdcxsxxListt() {
+        return bdcxsxxListt;
+    }
 
+    public void setBdcxsxxListt(List<Bdcxsxx> bdcxsxxListt) {
+        this.bdcxsxxListt = bdcxsxxListt;
+    }
 
+    public List<Jzfwxx> getJzfwList() {
+        return jzfwList;
+    }
 
-
-
+    public void setJzfwList(List<Jzfwxx> jzfwList) {
+        this.jzfwList = jzfwList;
+    }
 
     public String getTdys() {
         return tdys;

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

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<Fjys> fjyslist; // 附加要素列表
-    
+    private List<Fjys> FJYSLIST; // 附加要素列表
+    private List<Hwys> HWYSLIST; // 货物运输
+    private List<Bdcxsxx> BDCXSXX; // 不动产销售信息
+    private List<Jzfwxx> JZFWXX; // 建筑服务信息
+
     
 }

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<DDZXX> 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()) {

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