From 6bb7aff13bc7494e11c833f4b27d8151b24c48d3 Mon Sep 17 00:00:00 2001 From: dongxiaoke <1910333201@qq.com> Date: Mon, 27 Mar 2023 15:35:09 +0800 Subject: [PATCH] =?UTF-8?q?=E9=94=80=E9=A1=B9=E5=90=88=E5=B9=B6=EF=BC=9A?= =?UTF-8?q?=E8=93=9D=E5=AD=97=E5=8F=91=E7=A5=A8=E5=BC=80=E5=85=B7DTO?= =?UTF-8?q?=E5=AF=B9=E5=BA=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jianshui/invoice/domain/BillInfo.java | 78 ++++++++++++ .../request/aisino_jn/HxBillDetailDTO.java | 19 +++ .../request/aisino_jn/HxBillInfoDTO.java | 116 ++++++++++++++++++ .../domain/dto/{ => api}/jcsk/CxhzDTO.java | 2 +- .../dto/{ => api}/jcsk/CxhzJsonDataDTO.java | 2 +- .../{ => api}/jcsk/FileAcquisitionDTO.java | 2 +- .../jcsk/FileAcquisitionDetailDTO.java | 2 +- .../{ => api}/jcsk/FileAcquisitionOnDTO.java | 2 +- .../jcsk/FileAcquisitionOnDetailDTO.java | 2 +- .../domain/dto/{ => api}/jcsk/KshcDTO.java | 2 +- .../domain/dto/{ => api}/jcsk/QueryDTO.java | 2 +- .../domain/dto/{ => api}/jcsk/ShhzDTO.java | 2 +- .../dto/{ => api}/jcsk/ShhzJsonDataDTO.java | 2 +- .../domain/dto/{ => api}/jcsk/SqhzDTO.java | 2 +- .../dto/{ => api}/jcsk/SqhzJsonDataDTO.java | 2 +- .../{ => api}/jcsk/SqhzJsonDataDetailDTO.java | 2 +- .../domain/dto/{ => api}/jcsk/YhdjDTO.java | 2 +- .../dto/{ => api}/jcsk/YhdjDetailDTO.java | 2 +- .../{ => api}/jcsk/add/InvoiceAllAddDTO.java | 9 +- .../jcsk/add/InvoiceAllAddInfoDTO.java | 36 +++++- .../jcsk/add/InvoiceAllAddextDTO.java | 2 +- .../jcsk/add/InvoiceAllAddfjxxListDTO.java | 2 +- .../jcsk/add/InvoiceAllAddmxListDTO.java | 2 +- .../jcsk/add/InvoiceAllAddtdywxxDTO.java | 2 +- .../add/InvoiceAllAddtdywxxbdcjyzlfwDTO.java | 2 +- .../jcsk/add/InvoiceAllAddtdywxxjzfwDTO.java | 2 +- .../{ => api}/jcsk/red/AddRedInvoiceDTO.java | 2 +- 27 files changed, 273 insertions(+), 29 deletions(-) rename jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/{ => api}/jcsk/CxhzDTO.java (92%) rename jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/{ => api}/jcsk/CxhzJsonDataDTO.java (95%) rename jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/{ => api}/jcsk/FileAcquisitionDTO.java (94%) rename jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/{ => api}/jcsk/FileAcquisitionDetailDTO.java (91%) rename jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/{ => api}/jcsk/FileAcquisitionOnDTO.java (93%) rename jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/{ => api}/jcsk/FileAcquisitionOnDetailDTO.java (91%) rename jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/{ => api}/jcsk/KshcDTO.java (93%) rename jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/{ => api}/jcsk/QueryDTO.java (94%) rename jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/{ => api}/jcsk/ShhzDTO.java (92%) rename jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/{ => api}/jcsk/ShhzJsonDataDTO.java (91%) rename jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/{ => api}/jcsk/SqhzDTO.java (92%) rename jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/{ => api}/jcsk/SqhzJsonDataDTO.java (96%) rename jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/{ => api}/jcsk/SqhzJsonDataDetailDTO.java (95%) rename jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/{ => api}/jcsk/YhdjDTO.java (92%) rename jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/{ => api}/jcsk/YhdjDetailDTO.java (96%) rename jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/{ => api}/jcsk/add/InvoiceAllAddDTO.java (90%) rename jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/{ => api}/jcsk/add/InvoiceAllAddInfoDTO.java (77%) rename jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/{ => api}/jcsk/add/InvoiceAllAddextDTO.java (85%) rename jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/{ => api}/jcsk/add/InvoiceAllAddfjxxListDTO.java (88%) rename jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/{ => api}/jcsk/add/InvoiceAllAddmxListDTO.java (95%) rename jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/{ => api}/jcsk/add/InvoiceAllAddtdywxxDTO.java (83%) rename jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/{ => api}/jcsk/add/InvoiceAllAddtdywxxbdcjyzlfwDTO.java (94%) rename jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/{ => api}/jcsk/add/InvoiceAllAddtdywxxjzfwDTO.java (93%) rename jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/{ => api}/jcsk/red/AddRedInvoiceDTO.java (93%) 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 be94e5a..2490cd9 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 @@ -10,6 +10,8 @@ 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.jcsk.add.InvoiceAllAddtdywxxDTO; +import io.swagger.annotations.ApiModelProperty; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -244,6 +246,82 @@ public class BillInfo extends BaseEntity /** ext金财数科字段 */ private String ext; + /** 全电新增字段 **/ + private String async; + + @ApiModelProperty(value = "办税人身份证号") + private String bsrysfzjhm; + + @ApiModelProperty(value = "*地区编码(参考码表)") + private String dqbm; + + @ApiModelProperty(value = "lzfpkj") + private String serviceId; + + @ApiModelProperty(value = "放弃享受减按1%征收率原因") + private String kjlx; + + @ApiModelProperty(value = "出行人") + private String cxr; + + @ApiModelProperty(value = "出行人证件类型") + private String cxrzjlx; + + @ApiModelProperty(value = "出行人证件号码") + private String cxrzjhm; + + @ApiModelProperty(value = "出行日期") + private String cxrq; + + @ApiModelProperty(value = "出发地") + private String cfd; + + @ApiModelProperty(value = "到达地") + private String ddd; + + @ApiModelProperty(value = "交通工具类型") + private String jtgjlx; + + @ApiModelProperty(value = "等级") + private String dengj; + + @ApiModelProperty(value = "货物运输服务") + private String hwysfw; + + @ApiModelProperty(value = "起运地") + private String qyd; + + @ApiModelProperty(value = "运输工具号牌") + private String ysgjhp; + + @ApiModelProperty(value = "运输工具种类") + private String ysgjzl; + + @ApiModelProperty(value = "运输货物名称") + private String yshwmc; + + @ApiModelProperty(value = "含税标志 1-不含税 2-含税") + private String hsbz; + + @ApiModelProperty(value = "放弃享受减按1%征收率原因") + private String kjly; + + @ApiModelProperty(value = "附加信息名称") + private String fjxxmc; + + @ApiModelProperty(value = "附加信息内容") + private String fjxxnr; + + + + + + + + + + + @Override public String getSearchValue() { diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/adapter/request/aisino_jn/HxBillDetailDTO.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/adapter/request/aisino_jn/HxBillDetailDTO.java index 5a067cd..5ad1bea 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/adapter/request/aisino_jn/HxBillDetailDTO.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/adapter/request/aisino_jn/HxBillDetailDTO.java @@ -2,8 +2,10 @@ package com.jianshui.invoice.domain.dto.adapter.request.aisino_jn; import com.alibaba.fastjson.annotation.JSONField; import com.jianshui.common.annotation.Excel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotEmpty; import java.io.Serializable; import java.math.BigDecimal; @@ -193,4 +195,21 @@ public class HxBillDetailDTO implements Serializable { //折扣 @JSONField(name = "discount") private String discount; + + + + + + + + + + + + + + + + + } 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 9087338..d75200d 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 @@ -4,8 +4,11 @@ import com.alibaba.fastjson.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonFormat; import com.jianshui.common.annotation.Excel; import com.jianshui.invoice.domain.BillInfo; +import com.jianshui.invoice.domain.dto.api.jcsk.add.InvoiceAllAddtdywxxDTO; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotEmpty; import java.math.BigDecimal; import java.util.Date; import java.util.List; @@ -346,4 +349,117 @@ public class HxBillInfoDTO extends BillInfo { // @Transient // private transient String invoiceState; // 发票开票状态。数据库里没有这个字段 + + + /** 全电新增字段 **/ + @JSONField(name = "async") + private String async; + + @ApiModelProperty(value = "办税人身份证号") + @JSONField(name = "bsrysfzjhm") + private String bsrysfzjhm; + + @ApiModelProperty(value = "*地区编码(参考码表)") + @JSONField(name = "dqbm") + private String dqbm; + + @JSONField(name = "serviceId") + @ApiModelProperty(value = "lzfpkj") + private String serviceId; + + @JSONField(name = "kjlx") + @ApiModelProperty(value = "放弃享受减按1%征收率原因") + private String kjlx; + + @JSONField(name = "cxr") + @ApiModelProperty(value = "出行人") + private String cxr; + + @JSONField(name = "cxrzjlx") + @ApiModelProperty(value = "出行人证件类型") + private String cxrzjlx; + + @JSONField(name = "cxrzjhm") + @ApiModelProperty(value = "出行人证件号码") + private String cxrzjhm; + + @JSONField(name = "cxrq") + @ApiModelProperty(value = "出行日期") + private String cxrq; + + @JSONField(name = "cfd") + @ApiModelProperty(value = "出发地") + private String cfd; + + @JSONField(name = "ddd") + @ApiModelProperty(value = "到达地") + private String ddd; + + @JSONField(name = "jtgjlx") + @ApiModelProperty(value = "交通工具类型") + private String jtgjlx; + + @JSONField(name = "dengj") + @ApiModelProperty(value = "等级") + private String dengj; + + @JSONField(name = "hwysfw") + @ApiModelProperty(value = "货物运输服务") + private String hwysfw; + + @JSONField(name = "qyd") + @ApiModelProperty(value = "起运地") + private String qyd; + + @JSONField(name = "ysgjhp") + @ApiModelProperty(value = "运输工具号牌") + private String ysgjhp; + + @JSONField(name = "ysgjzl") + @ApiModelProperty(value = "运输工具种类") + private String ysgjzl; + + @JSONField(name = "yshwmc") + @ApiModelProperty(value = "运输货物名称") + private String yshwmc; + + + // TODO: 2023/3/27 + @ApiModelProperty(value = "购方信息确认") + private String gfxxconfirm; + + @ApiModelProperty(value = "含税标志 1-不含税 2-含税") + private String hsbz; + + @ApiModelProperty(value = "特定类型代码") + private String tdyslxdm; + + + @ApiModelProperty(value = "附加信息名称") + private String fjxxmc; + + @ApiModelProperty(value = "附加信息内容") + private String fjxxnr; + + @ApiModelProperty(value = "不动产") + List tdywxx; + + + + + + + + + + + + + + + + + + + } diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/jcsk/CxhzDTO.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/CxhzDTO.java similarity index 92% rename from jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/jcsk/CxhzDTO.java rename to jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/CxhzDTO.java index 4fdcdc7..b828e0d 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/jcsk/CxhzDTO.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/CxhzDTO.java @@ -1,4 +1,4 @@ -package com.jianshui.invoice.domain.dto.jcsk; +package com.jianshui.invoice.domain.dto.api.jcsk; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/jcsk/CxhzJsonDataDTO.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/CxhzJsonDataDTO.java similarity index 95% rename from jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/jcsk/CxhzJsonDataDTO.java rename to jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/CxhzJsonDataDTO.java index e6f51e2..32a3f07 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/jcsk/CxhzJsonDataDTO.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/CxhzJsonDataDTO.java @@ -1,4 +1,4 @@ -package com.jianshui.invoice.domain.dto.jcsk; +package com.jianshui.invoice.domain.dto.api.jcsk; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/jcsk/FileAcquisitionDTO.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/FileAcquisitionDTO.java similarity index 94% rename from jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/jcsk/FileAcquisitionDTO.java rename to jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/FileAcquisitionDTO.java index e526259..2deb550 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/jcsk/FileAcquisitionDTO.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/FileAcquisitionDTO.java @@ -1,4 +1,4 @@ -package com.jianshui.invoice.domain.dto.jcsk; +package com.jianshui.invoice.domain.dto.api.jcsk; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/jcsk/FileAcquisitionDetailDTO.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/FileAcquisitionDetailDTO.java similarity index 91% rename from jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/jcsk/FileAcquisitionDetailDTO.java rename to jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/FileAcquisitionDetailDTO.java index e020773..112bbef 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/jcsk/FileAcquisitionDetailDTO.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/FileAcquisitionDetailDTO.java @@ -1,4 +1,4 @@ -package com.jianshui.invoice.domain.dto.jcsk; +package com.jianshui.invoice.domain.dto.api.jcsk; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/jcsk/FileAcquisitionOnDTO.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/FileAcquisitionOnDTO.java similarity index 93% rename from jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/jcsk/FileAcquisitionOnDTO.java rename to jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/FileAcquisitionOnDTO.java index 958ee2b..7d63af9 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/jcsk/FileAcquisitionOnDTO.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/FileAcquisitionOnDTO.java @@ -1,4 +1,4 @@ -package com.jianshui.invoice.domain.dto.jcsk; +package com.jianshui.invoice.domain.dto.api.jcsk; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/jcsk/FileAcquisitionOnDetailDTO.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/FileAcquisitionOnDetailDTO.java similarity index 91% rename from jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/jcsk/FileAcquisitionOnDetailDTO.java rename to jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/FileAcquisitionOnDetailDTO.java index 5ef2256..8f5b87c 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/jcsk/FileAcquisitionOnDetailDTO.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/FileAcquisitionOnDetailDTO.java @@ -1,4 +1,4 @@ -package com.jianshui.invoice.domain.dto.jcsk; +package com.jianshui.invoice.domain.dto.api.jcsk; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/jcsk/KshcDTO.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/KshcDTO.java similarity index 93% rename from jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/jcsk/KshcDTO.java rename to jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/KshcDTO.java index cb68251..268dd08 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/jcsk/KshcDTO.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/KshcDTO.java @@ -1,4 +1,4 @@ -package com.jianshui.invoice.domain.dto.jcsk; +package com.jianshui.invoice.domain.dto.api.jcsk; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/jcsk/QueryDTO.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/QueryDTO.java similarity index 94% rename from jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/jcsk/QueryDTO.java rename to jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/QueryDTO.java index 57b034b..219d564 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/jcsk/QueryDTO.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/QueryDTO.java @@ -1,4 +1,4 @@ -package com.jianshui.invoice.domain.dto.jcsk; +package com.jianshui.invoice.domain.dto.api.jcsk; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/jcsk/ShhzDTO.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/ShhzDTO.java similarity index 92% rename from jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/jcsk/ShhzDTO.java rename to jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/ShhzDTO.java index 05e5d61..d066709 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/jcsk/ShhzDTO.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/ShhzDTO.java @@ -1,4 +1,4 @@ -package com.jianshui.invoice.domain.dto.jcsk; +package com.jianshui.invoice.domain.dto.api.jcsk; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/jcsk/ShhzJsonDataDTO.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/ShhzJsonDataDTO.java similarity index 91% rename from jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/jcsk/ShhzJsonDataDTO.java rename to jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/ShhzJsonDataDTO.java index fecf53a..ede9515 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/jcsk/ShhzJsonDataDTO.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/ShhzJsonDataDTO.java @@ -1,4 +1,4 @@ -package com.jianshui.invoice.domain.dto.jcsk; +package com.jianshui.invoice.domain.dto.api.jcsk; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/jcsk/SqhzDTO.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/SqhzDTO.java similarity index 92% rename from jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/jcsk/SqhzDTO.java rename to jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/SqhzDTO.java index 2de59ca..af6e741 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/jcsk/SqhzDTO.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/SqhzDTO.java @@ -1,4 +1,4 @@ -package com.jianshui.invoice.domain.dto.jcsk; +package com.jianshui.invoice.domain.dto.api.jcsk; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/jcsk/SqhzJsonDataDTO.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/SqhzJsonDataDTO.java similarity index 96% rename from jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/jcsk/SqhzJsonDataDTO.java rename to jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/SqhzJsonDataDTO.java index 7c63484..893315c 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/jcsk/SqhzJsonDataDTO.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/SqhzJsonDataDTO.java @@ -1,4 +1,4 @@ -package com.jianshui.invoice.domain.dto.jcsk; +package com.jianshui.invoice.domain.dto.api.jcsk; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/jcsk/SqhzJsonDataDetailDTO.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/SqhzJsonDataDetailDTO.java similarity index 95% rename from jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/jcsk/SqhzJsonDataDetailDTO.java rename to jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/SqhzJsonDataDetailDTO.java index 7835587..6074552 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/jcsk/SqhzJsonDataDetailDTO.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/SqhzJsonDataDetailDTO.java @@ -1,4 +1,4 @@ -package com.jianshui.invoice.domain.dto.jcsk; +package com.jianshui.invoice.domain.dto.api.jcsk; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/jcsk/YhdjDTO.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/YhdjDTO.java similarity index 92% rename from jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/jcsk/YhdjDTO.java rename to jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/YhdjDTO.java index e57a93c..41b1320 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/jcsk/YhdjDTO.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/YhdjDTO.java @@ -1,4 +1,4 @@ -package com.jianshui.invoice.domain.dto.jcsk; +package com.jianshui.invoice.domain.dto.api.jcsk; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/jcsk/YhdjDetailDTO.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/YhdjDetailDTO.java similarity index 96% rename from jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/jcsk/YhdjDetailDTO.java rename to jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/YhdjDetailDTO.java index 2adb1f7..2f55eae 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/jcsk/YhdjDetailDTO.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/YhdjDetailDTO.java @@ -1,4 +1,4 @@ -package com.jianshui.invoice.domain.dto.jcsk; +package com.jianshui.invoice.domain.dto.api.jcsk; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/jcsk/add/InvoiceAllAddDTO.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/add/InvoiceAllAddDTO.java similarity index 90% rename from jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/jcsk/add/InvoiceAllAddDTO.java rename to jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/add/InvoiceAllAddDTO.java index ca887fc..3501231 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/jcsk/add/InvoiceAllAddDTO.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/add/InvoiceAllAddDTO.java @@ -1,5 +1,6 @@ -package com.jianshui.invoice.domain.dto.jcsk.add; +package com.jianshui.invoice.domain.dto.api.jcsk.add; +import cn.hutool.core.annotation.Alias; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -13,9 +14,6 @@ import javax.validation.constraints.NotEmpty; @Data public class InvoiceAllAddDTO { - @ApiModelProperty(value = "渠道标识") - private String appkey; - @NotEmpty @ApiModelProperty(value = "true") private String async; @@ -29,7 +27,8 @@ public class InvoiceAllAddDTO { private String dqbm; @NotEmpty - @ApiModelProperty(value = "*纳税人识别号") + @ApiModelProperty(value = "纳税人识别号=销方企业税号") + @Alias("saletaxnum") private String nsrsbh; @NotEmpty diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/jcsk/add/InvoiceAllAddInfoDTO.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/add/InvoiceAllAddInfoDTO.java similarity index 77% rename from jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/jcsk/add/InvoiceAllAddInfoDTO.java rename to jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/add/InvoiceAllAddInfoDTO.java index bc5782c..5249333 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/jcsk/add/InvoiceAllAddInfoDTO.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/add/InvoiceAllAddInfoDTO.java @@ -1,5 +1,6 @@ -package com.jianshui.invoice.domain.dto.jcsk.add; +package com.jianshui.invoice.domain.dto.api.jcsk.add; +import cn.hutool.core.annotation.Alias; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -14,13 +15,18 @@ import java.util.List; @Data public class InvoiceAllAddInfoDTO { + /** message*/ + @Alias("message") @ApiModelProperty(value = "备注") private String bz; + /** invoiceline*/ + @Alias("invoiceType") @NotEmpty @ApiModelProperty(value = "发票类型代码") private String fplxdm; + /** fpqqlsh*/ @NotEmpty @ApiModelProperty(value = "发票请求流水号") private String fpqqlsh; @@ -28,26 +34,39 @@ public class InvoiceAllAddInfoDTO { @ApiModelProperty(value = "购方信息确认") private String gfxxconfirm; + /** address*/ + @Alias("buyerAddress") @NotEmpty @ApiModelProperty(value = "购买方地址") private String gmfdz; + /** buyerBank*/ + @Alias("buyerBank") @NotEmpty @ApiModelProperty(value = "购买方开户行") private String gmfkhh; + + /** phone*/ + @Alias("buyerPhone") @NotEmpty @ApiModelProperty(value = "购买方联系电话") private String gmflxdh; + /** buyerName*/ + @Alias("buyerName") @NotEmpty @ApiModelProperty(value = "购买方名称") private String gmfmc; + /** taxnum*/ + @Alias("buyerTaxnum") @NotEmpty @ApiModelProperty(value = "购买方税号") private String gmfnsrsbh; + /** fpqqlsh*/ + @Alias("buyerAccount") @NotEmpty @ApiModelProperty(value = "购买方银行账号") private String gmfyhzh; @@ -60,6 +79,7 @@ public class InvoiceAllAddInfoDTO { @ApiModelProperty(value = "合计税额") private String hjse; + /** hsbz*/ @NotEmpty @ApiModelProperty(value = "含税标志 1-不含税 2-含税") private String hsbz; @@ -84,7 +104,7 @@ public class InvoiceAllAddInfoDTO { @ApiModelProperty(value = "价税合计") private String jshj; - @ApiModelProperty(value = "") + @ApiModelProperty(value = "放弃享受减按1%征收率原因") private String kjly; // 特定业务必填 @@ -92,26 +112,38 @@ public class InvoiceAllAddInfoDTO { @ApiModelProperty(value = "特定要素类型代码") private String tdyslxdm; + /** saleaddress*/ + @Alias("sellerAddress") @NotEmpty @ApiModelProperty(value = "销方地址") private String xsfdz; + /** sellerBank*/ + @Alias("sellerBank") @NotEmpty @ApiModelProperty(value = "销方开户行") private String xsfkhh; + /** salephone*/ + @Alias("sellerTelephone") @NotEmpty @ApiModelProperty(value = "销方联系电话") private String xsflxdh; + /** fpqqlsh*/ + @Alias("sellerName") @NotEmpty @ApiModelProperty(value = "销方名称") private String xsfmc; + /** saletaxnum*/ + @Alias("sellerTaxnum") @NotEmpty @ApiModelProperty(value = "销方税号") private String xsfnsrsbh; + /** saleaccount*/ + @Alias("sellerAccount") @NotEmpty @ApiModelProperty(value = "销方银行账号") private String xsfyhzh; diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/jcsk/add/InvoiceAllAddextDTO.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/add/InvoiceAllAddextDTO.java similarity index 85% rename from jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/jcsk/add/InvoiceAllAddextDTO.java rename to jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/add/InvoiceAllAddextDTO.java index baae932..cfd9149 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/jcsk/add/InvoiceAllAddextDTO.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/add/InvoiceAllAddextDTO.java @@ -1,4 +1,4 @@ -package com.jianshui.invoice.domain.dto.jcsk.add; +package com.jianshui.invoice.domain.dto.api.jcsk.add; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/jcsk/add/InvoiceAllAddfjxxListDTO.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/add/InvoiceAllAddfjxxListDTO.java similarity index 88% rename from jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/jcsk/add/InvoiceAllAddfjxxListDTO.java rename to jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/add/InvoiceAllAddfjxxListDTO.java index ff47bf3..f897908 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/jcsk/add/InvoiceAllAddfjxxListDTO.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/add/InvoiceAllAddfjxxListDTO.java @@ -1,4 +1,4 @@ -package com.jianshui.invoice.domain.dto.jcsk.add; +package com.jianshui.invoice.domain.dto.api.jcsk.add; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/jcsk/add/InvoiceAllAddmxListDTO.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/add/InvoiceAllAddmxListDTO.java similarity index 95% rename from jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/jcsk/add/InvoiceAllAddmxListDTO.java rename to jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/add/InvoiceAllAddmxListDTO.java index 57e044b..a45fd4c 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/jcsk/add/InvoiceAllAddmxListDTO.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/add/InvoiceAllAddmxListDTO.java @@ -1,4 +1,4 @@ -package com.jianshui.invoice.domain.dto.jcsk.add; +package com.jianshui.invoice.domain.dto.api.jcsk.add; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/jcsk/add/InvoiceAllAddtdywxxDTO.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/add/InvoiceAllAddtdywxxDTO.java similarity index 83% rename from jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/jcsk/add/InvoiceAllAddtdywxxDTO.java rename to jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/add/InvoiceAllAddtdywxxDTO.java index 36dbe77..6a9fba7 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/jcsk/add/InvoiceAllAddtdywxxDTO.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/add/InvoiceAllAddtdywxxDTO.java @@ -1,4 +1,4 @@ -package com.jianshui.invoice.domain.dto.jcsk.add; +package com.jianshui.invoice.domain.dto.api.jcsk.add; import lombok.Data; diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/jcsk/add/InvoiceAllAddtdywxxbdcjyzlfwDTO.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/add/InvoiceAllAddtdywxxbdcjyzlfwDTO.java similarity index 94% rename from jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/jcsk/add/InvoiceAllAddtdywxxbdcjyzlfwDTO.java rename to jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/add/InvoiceAllAddtdywxxbdcjyzlfwDTO.java index 47e792f..d083bda 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/jcsk/add/InvoiceAllAddtdywxxbdcjyzlfwDTO.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/add/InvoiceAllAddtdywxxbdcjyzlfwDTO.java @@ -1,4 +1,4 @@ -package com.jianshui.invoice.domain.dto.jcsk.add; +package com.jianshui.invoice.domain.dto.api.jcsk.add; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/jcsk/add/InvoiceAllAddtdywxxjzfwDTO.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/add/InvoiceAllAddtdywxxjzfwDTO.java similarity index 93% rename from jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/jcsk/add/InvoiceAllAddtdywxxjzfwDTO.java rename to jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/add/InvoiceAllAddtdywxxjzfwDTO.java index a8b82f1..8096a61 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/jcsk/add/InvoiceAllAddtdywxxjzfwDTO.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/add/InvoiceAllAddtdywxxjzfwDTO.java @@ -1,4 +1,4 @@ -package com.jianshui.invoice.domain.dto.jcsk.add; +package com.jianshui.invoice.domain.dto.api.jcsk.add; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/jcsk/red/AddRedInvoiceDTO.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/red/AddRedInvoiceDTO.java similarity index 93% rename from jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/jcsk/red/AddRedInvoiceDTO.java rename to jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/red/AddRedInvoiceDTO.java index 42d5e61..8757a2a 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/jcsk/red/AddRedInvoiceDTO.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/red/AddRedInvoiceDTO.java @@ -1,4 +1,4 @@ -package com.jianshui.invoice.domain.dto.jcsk.red; +package com.jianshui.invoice.domain.dto.api.jcsk.red; import lombok.Data;