From 9a555c003f51c03d864925ea1765cf2a2d5f6a6c Mon Sep 17 00:00:00 2001 From: xingze <13153582609@163.com> Date: Mon, 23 Sep 2024 14:47:26 +0800 Subject: [PATCH] =?UTF-8?q?feature:=20=E5=BB=BA=E7=AD=91=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=8E=A5=E6=94=B6=E5=A4=B1=E8=B4=A5=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jianshui/invoice/domain/BillInfo.java | 12 ---- .../domain/dto/api/elephant/DDZXX.java | 56 ++++++++----------- .../domain/dto/api/elephant/EleJZFWXX.java | 28 ---------- .../dto/api/elephant/addInvoice/Jzfwxx.java | 1 + .../api/ElephantInvoiceApiV6ServiceImpl.java | 6 +- 5 files changed, 26 insertions(+), 77 deletions(-) delete mode 100644 jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/elephant/EleJZFWXX.java 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 c07d3ac..fb98d0f 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 @@ -477,9 +477,6 @@ public class BillInfo extends BaseEntity // 是否展示销方银行账号 @TableField(exist=false) private String sfzsxfyhzh; - // 涉税事项报告表 - @TableField(exist=false) - private String sssxbgb; // 红冲查询接口（红字确认单编号） @TableField(exist=false) private String requestId; @@ -489,15 +486,6 @@ public class BillInfo extends BaseEntity @TableField(exist=false) private String tsxt; - - public String getSssxbgb() { - return sssxbgb; - } - - public void setSssxbgb(String sssxbgb) { - this.sssxbgb = sssxbgb; - } - public String getRequestId() { return requestId; } 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 c21ab47..cc5243b 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 @@ -1,8 +1,10 @@ /** - * Copyright 2022 bejson.com - */ + * Copyright 2022 bejson.com + */ package com.jianshui.invoice.domain.dto.api.elephant; +import com.jianshui.invoice.domain.dto.api.elephant.addInvoice.Jzfwxx; + import java.util.List; /** @@ -18,18 +20,8 @@ public class DDZXX { private DDTXX DDTXX; // 订单头信息 private ESCTXX ESCTXX; // 二手车头信息 private JDCTXX JDCTXX; // 机动车头信息 - private EleJZFWXX JZFWXX; // 建筑服务信息 private List DDMXXX; // 订单明细信息 - - public EleJZFWXX getJZFWXX() { - return JZFWXX; - } - - public void setJZFWXX(EleJZFWXX JZFWXX) { - this.JZFWXX = JZFWXX; - } - public Qdtxx getQDTXX() { return QDTXX; } @@ -38,31 +30,31 @@ public class DDZXX { this.QDTXX = QDTXX; } public void setDDTXX(DDTXX DDTXX) { - this.DDTXX = DDTXX; - } - public DDTXX getDDTXX() { - return DDTXX; - } + this.DDTXX = DDTXX; + } + public DDTXX getDDTXX() { + return DDTXX; + } public void setESCTXX(ESCTXX ESCTXX) { - this.ESCTXX = ESCTXX; - } - public ESCTXX getESCTXX() { - return ESCTXX; - } + this.ESCTXX = ESCTXX; + } + public ESCTXX getESCTXX() { + return ESCTXX; + } public void setJDCTXX(JDCTXX JDCTXX) { - this.JDCTXX = JDCTXX; - } - public JDCTXX getJDCTXX() { - return JDCTXX; - } + this.JDCTXX = JDCTXX; + } + public JDCTXX getJDCTXX() { + return JDCTXX; + } public void setDDMXXX(List DDMXXX) { - this.DDMXXX = DDMXXX; - } - public List getDDMXXX() { - return DDMXXX; - } + this.DDMXXX = DDMXXX; + } + public List getDDMXXX() { + return DDMXXX; + } } \ No newline at end of file diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/elephant/EleJZFWXX.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/elephant/EleJZFWXX.java deleted file mode 100644 index 5035a4a..0000000 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/elephant/EleJZFWXX.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.jianshui.invoice.domain.dto.api.elephant; - -import lombok.Getter; -import lombok.Setter; -import lombok.ToString; - -import java.io.Serializable; - -@Getter -@Setter -@ToString -public class EleJZFWXX implements Serializable { - - /** - * TDZZSXMBH : 土地增值税项目编号 - * JZFWFSD : 建筑服务发生地 - * JZFWMC : 建筑服务名称 - * KDSBZ : 跨地(市)标志 - * KQYSSSXBGGLBM : 跨区域涉税事顶报验管理编号 - */ - - private String TDZZSXMBH; - private String JZFWFSD; - private String JZFWMC; - private String KDSBZ; - - private String KQYSSSXBGGLBM; -} \ No newline at end of file diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/elephant/addInvoice/Jzfwxx.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/elephant/addInvoice/Jzfwxx.java index 1e54330..dcc91c5 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/elephant/addInvoice/Jzfwxx.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/elephant/addInvoice/Jzfwxx.java @@ -15,6 +15,7 @@ public class Jzfwxx { private String JZFWMC; // 建筑服务名称 private String KDSBZ; // 跨地(市)标志 + private String SSSXBGB; // 涉税事项报告表 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 146cb4a..b4120f6 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 @@ -37,6 +37,7 @@ import com.jianshui.invoice.domain.*; import com.jianshui.invoice.domain.dto.*; import com.jianshui.invoice.domain.dto.api.*; import com.jianshui.invoice.domain.dto.api.elephant.*; +import com.jianshui.invoice.domain.dto.api.elephant.addInvoice.Jzfwxx; import com.jianshui.invoice.domain.dto.api.elephant.sd.GetRpaAuthStatusDTO; import com.jianshui.invoice.domain.dto.api.elephant.sd.HZQRDMXLIST; import com.jianshui.invoice.domain.dto.api.elephant.sd.RedDownload; @@ -315,16 +316,11 @@ public class ElephantInvoiceApiV6ServiceImpl implements IInvoiceApiService { } // 开始封装请求报文 - // todo 20240912 建筑服务类型增加 - EleJZFWXX jzfwxx = new EleJZFWXX(); - jzfwxx.setKQYSSSXBGGLBM(billInfo.getSssxbgb()); - ElephantInvoiceAddDTO elephantInvoiceAddDTO = new ElephantInvoiceAddDTO(); elephantInvoiceAddDTO.setDDPCXX(ddpcxx); DDZXX ddzxx = new DDZXX(); ddzxx.setDDTXX(ddtxx); ddzxx.setDDMXXX(ddmxxxList); - ddzxx.setJZFWXX(jzfwxx); // 全电头信息 ddzxx.setQDTXX(qdtxx); List ddzxxes = new ArrayList<>();