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 2490cd9..f028031 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 @@ -5,12 +5,10 @@ import java.util.List; import java.util.Date; import java.util.Map; -import com.alibaba.fastjson.annotation.JSONField; 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; @@ -381,6 +379,182 @@ public class BillInfo extends BaseEntity return jrznsrsbh; } + public String getAsync() { + return async; + } + + public void setAsync(String async) { + this.async = async; + } + + public String getBsrysfzjhm() { + return bsrysfzjhm; + } + + public void setBsrysfzjhm(String bsrysfzjhm) { + this.bsrysfzjhm = bsrysfzjhm; + } + + public String getDqbm() { + return dqbm; + } + + public void setDqbm(String dqbm) { + this.dqbm = dqbm; + } + + public String getServiceId() { + return serviceId; + } + + public void setServiceId(String serviceId) { + this.serviceId = serviceId; + } + + public String getKjlx() { + return kjlx; + } + + public void setKjlx(String kjlx) { + this.kjlx = kjlx; + } + + public String getCxr() { + return cxr; + } + + public void setCxr(String cxr) { + this.cxr = cxr; + } + + public String getCxrzjlx() { + return cxrzjlx; + } + + public void setCxrzjlx(String cxrzjlx) { + this.cxrzjlx = cxrzjlx; + } + + public String getCxrzjhm() { + return cxrzjhm; + } + + public void setCxrzjhm(String cxrzjhm) { + this.cxrzjhm = cxrzjhm; + } + + public String getCxrq() { + return cxrq; + } + + public void setCxrq(String cxrq) { + this.cxrq = cxrq; + } + + public String getCfd() { + return cfd; + } + + public void setCfd(String cfd) { + this.cfd = cfd; + } + + public String getDdd() { + return ddd; + } + + public void setDdd(String ddd) { + this.ddd = ddd; + } + + public String getJtgjlx() { + return jtgjlx; + } + + public void setJtgjlx(String jtgjlx) { + this.jtgjlx = jtgjlx; + } + + public String getDengj() { + return dengj; + } + + public void setDengj(String dengj) { + this.dengj = dengj; + } + + public String getHwysfw() { + return hwysfw; + } + + public void setHwysfw(String hwysfw) { + this.hwysfw = hwysfw; + } + + public String getQyd() { + return qyd; + } + + public void setQyd(String qyd) { + this.qyd = qyd; + } + + public String getYsgjhp() { + return ysgjhp; + } + + public void setYsgjhp(String ysgjhp) { + this.ysgjhp = ysgjhp; + } + + public String getYsgjzl() { + return ysgjzl; + } + + public void setYsgjzl(String ysgjzl) { + this.ysgjzl = ysgjzl; + } + + public String getYshwmc() { + return yshwmc; + } + + public void setYshwmc(String yshwmc) { + this.yshwmc = yshwmc; + } + + public String getHsbz() { + return hsbz; + } + + public void setHsbz(String hsbz) { + this.hsbz = hsbz; + } + + public String getKjly() { + return kjly; + } + + public void setKjly(String kjly) { + this.kjly = kjly; + } + + public String getFjxxmc() { + return fjxxmc; + } + + public void setFjxxmc(String fjxxmc) { + this.fjxxmc = fjxxmc; + } + + public String getFjxxnr() { + return fjxxnr; + } + + public void setFjxxnr(String fjxxnr) { + this.fjxxnr = fjxxnr; + } + public void setJrznsrsbh(String jrznsrsbh) { this.jrznsrsbh = jrznsrsbh; } 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 d75200d..46f383b 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,11 +4,9 @@ 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; @@ -441,8 +439,8 @@ public class HxBillInfoDTO extends BillInfo { @ApiModelProperty(value = "附加信息内容") private String fjxxnr; - @ApiModelProperty(value = "不动产") - List tdywxx; +// @ApiModelProperty(value = "不动产") +// List tdywxx; diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/CxhzJsonDataDTO.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/CxhzJsonDataTwoDTO.java similarity index 96% rename from jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/CxhzJsonDataDTO.java rename to jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/CxhzJsonDataTwoDTO.java index 32a3f07..de15fb2 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/CxhzJsonDataDTO.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/CxhzJsonDataTwoDTO.java @@ -11,7 +11,7 @@ import javax.validation.constraints.NotEmpty; * @date 2022年12月09日 17:16 */ @Data -public class CxhzJsonDataDTO { +public class CxhzJsonDataTwoDTO { @NotEmpty @ApiModelProperty(value = "申请来源") diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/CxhzDTO.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/CxhzTwoDTO.java similarity index 90% rename from jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/CxhzDTO.java rename to jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/CxhzTwoDTO.java index b828e0d..750ade5 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/CxhzDTO.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/CxhzTwoDTO.java @@ -11,7 +11,7 @@ import javax.validation.constraints.NotEmpty; * @date 2022年12月09日 17:16 */ @Data -public class CxhzDTO { +public class CxhzTwoDTO { @NotEmpty @ApiModelProperty(value = "true") @@ -30,7 +30,7 @@ public class CxhzDTO { private String nsrsbh; - private CxhzJsonDataDTO jsonData; + private CxhzJsonDataTwoDTO jsonData; } diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/FileAcquisitionDetailDTO.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/FileAcquisitionDetailTwoDTO.java similarity index 92% rename from jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/FileAcquisitionDetailDTO.java rename to jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/FileAcquisitionDetailTwoDTO.java index 112bbef..ccbb3f7 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/FileAcquisitionDetailDTO.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/FileAcquisitionDetailTwoDTO.java @@ -12,7 +12,7 @@ import javax.validation.constraints.NotEmpty; * @date 2022年12月09日 17:16 */ @Data -public class FileAcquisitionDetailDTO { +public class FileAcquisitionDetailTwoDTO { @NotEmpty @ApiModelProperty(value = "全电发票号码") diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/FileAcquisitionOnDetailDTO.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/FileAcquisitionOnDetailTwoDTO.java similarity index 92% rename from jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/FileAcquisitionOnDetailDTO.java rename to jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/FileAcquisitionOnDetailTwoDTO.java index 8f5b87c..3955eff 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/FileAcquisitionOnDetailDTO.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/FileAcquisitionOnDetailTwoDTO.java @@ -11,7 +11,7 @@ import javax.validation.constraints.NotEmpty; * @date 2022年12月09日 17:16 */ @Data -public class FileAcquisitionOnDetailDTO { +public class FileAcquisitionOnDetailTwoDTO { @NotEmpty diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/FileAcquisitionOnDTO.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/FileAcquisitionOnTwoDTO.java similarity index 87% rename from jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/FileAcquisitionOnDTO.java rename to jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/FileAcquisitionOnTwoDTO.java index 7d63af9..6640876 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/FileAcquisitionOnDTO.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/FileAcquisitionOnTwoDTO.java @@ -11,7 +11,7 @@ import javax.validation.constraints.NotEmpty; * @date 2022年12月09日 17:16 */ @Data -public class FileAcquisitionOnDTO { +public class FileAcquisitionOnTwoDTO { @@ -31,6 +31,6 @@ public class FileAcquisitionOnDTO { @ApiModelProperty(value = "*纳税人识别号") private String nsrsbh; - private FileAcquisitionOnDetailDTO jsonData; + private FileAcquisitionOnDetailTwoDTO jsonData; } diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/FileAcquisitionDTO.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/FileAcquisitionTwoDTO.java similarity index 95% rename from jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/FileAcquisitionDTO.java rename to jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/FileAcquisitionTwoDTO.java index 2deb550..91c0924 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/FileAcquisitionDTO.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/FileAcquisitionTwoDTO.java @@ -12,7 +12,7 @@ import javax.validation.constraints.NotEmpty; * @date 2022年12月09日 17:16 */ @Data -public class FileAcquisitionDTO { +public class FileAcquisitionTwoDTO { @NotEmpty @ApiModelProperty(value = "true") diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/KshcDTO.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/KshcTwoTwoDTO.java similarity index 96% rename from jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/KshcDTO.java rename to jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/KshcTwoTwoDTO.java index 268dd08..eba88d9 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/KshcDTO.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/KshcTwoTwoDTO.java @@ -9,7 +9,7 @@ import javax.validation.constraints.NotEmpty; * 快速红冲 */ @Data -public class KshcDTO { +public class KshcTwoTwoDTO { @NotEmpty diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/QueryDTO.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/QueryTwoDTO.java similarity index 97% rename from jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/QueryDTO.java rename to jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/QueryTwoDTO.java index 219d564..1ec4f08 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/QueryDTO.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/QueryTwoDTO.java @@ -11,7 +11,7 @@ import javax.validation.constraints.NotEmpty; * @date 2022年12月09日 17:16 */ @Data -public class QueryDTO { +public class QueryTwoDTO { @NotEmpty @ApiModelProperty(value = "渠道标识") diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/ShhzJsonDataDTO.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/ShhzJsonDataTwoDTO.java similarity index 94% rename from jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/ShhzJsonDataDTO.java rename to jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/ShhzJsonDataTwoDTO.java index ede9515..b2516aa 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/ShhzJsonDataDTO.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/ShhzJsonDataTwoDTO.java @@ -11,7 +11,7 @@ import javax.validation.constraints.NotEmpty; * @date 2022年12月09日 17:16 */ @Data -public class ShhzJsonDataDTO { +public class ShhzJsonDataTwoDTO { @NotEmpty @ApiModelProperty(value = "确认类型") diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/ShhzDTO.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/ShhzTwoDTO.java similarity index 90% rename from jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/ShhzDTO.java rename to jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/ShhzTwoDTO.java index d066709..c65d76a 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/ShhzDTO.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/ShhzTwoDTO.java @@ -11,7 +11,7 @@ import javax.validation.constraints.NotEmpty; * @date 2022年12月09日 17:16 */ @Data -public class ShhzDTO { +public class ShhzTwoDTO { @NotEmpty @ApiModelProperty(value = "true") @@ -29,7 +29,7 @@ public class ShhzDTO { @ApiModelProperty(value = "*纳税人识别号") private String nsrsbh; - private ShhzJsonDataDTO jsonData; + private ShhzJsonDataTwoDTO jsonData; } diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/SqhzJsonDataDetailDTO.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/SqhzJsonDataDetailTwoDTO.java similarity index 96% rename from jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/SqhzJsonDataDetailDTO.java rename to jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/SqhzJsonDataDetailTwoDTO.java index 6074552..293a27b 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/SqhzJsonDataDetailDTO.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/SqhzJsonDataDetailTwoDTO.java @@ -11,7 +11,7 @@ import javax.validation.constraints.NotEmpty; * @date 2022年12月09日 17:16 */ @Data -public class SqhzJsonDataDetailDTO { +public class SqhzJsonDataDetailTwoDTO { @NotEmpty @ApiModelProperty(value = "单价") diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/SqhzJsonDataDTO.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/SqhzJsonDataTwoDTO.java similarity index 93% rename from jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/SqhzJsonDataDTO.java rename to jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/SqhzJsonDataTwoDTO.java index 893315c..15fef5f 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/SqhzJsonDataDTO.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/SqhzJsonDataTwoDTO.java @@ -12,7 +12,7 @@ import java.util.List; * @date 2022年12月09日 17:16 */ @Data -public class SqhzJsonDataDTO { +public class SqhzJsonDataTwoDTO { @NotEmpty @ApiModelProperty(value = "冲红原因代码") @@ -58,7 +58,7 @@ public class SqhzJsonDataDTO { @ApiModelProperty(value = "原纸质发票号码") private String yzzfphm; - private List hzqrxxmxlist; + private List hzqrxxmxlist; } diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/SqhzDTO.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/SqhzTwoDTO.java similarity index 90% rename from jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/SqhzDTO.java rename to jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/SqhzTwoDTO.java index af6e741..b82223b 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/SqhzDTO.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/SqhzTwoDTO.java @@ -11,7 +11,7 @@ import javax.validation.constraints.NotEmpty; * @date 2022年12月09日 17:16 */ @Data -public class SqhzDTO { +public class SqhzTwoDTO { @NotEmpty @ApiModelProperty(value = "true") @@ -29,7 +29,7 @@ public class SqhzDTO { @ApiModelProperty(value = "纳税人识别号") private String nsrsbh; - private SqhzJsonDataDTO jsonData; + private SqhzJsonDataTwoDTO jsonData; diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/YhdjDetailDTO.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/YhdjDetailTwoDTO.java similarity index 97% rename from jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/YhdjDetailDTO.java rename to jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/YhdjDetailTwoDTO.java index 2f55eae..533e178 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/YhdjDetailDTO.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/YhdjDetailTwoDTO.java @@ -8,7 +8,7 @@ import lombok.Data; * @date 2022年12月09日 17:16 */ @Data -public class YhdjDetailDTO { +public class YhdjDetailTwoDTO { @ApiModelProperty(value = "*办税人员姓名(税局实名认证的人员)") private String bsryxm; diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/YhdjDTO.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/YhdjTwoDTO.java similarity index 91% rename from jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/YhdjDTO.java rename to jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/YhdjTwoDTO.java index 41b1320..386a865 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/YhdjDTO.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/YhdjTwoDTO.java @@ -8,7 +8,7 @@ import lombok.Data; * @date 2022年12月09日 17:16 */ @Data -public class YhdjDTO { +public class YhdjTwoDTO { @ApiModelProperty(value = "渠道标识") private String appkey; @@ -26,6 +26,6 @@ public class YhdjDTO { - YhdjDetailDTO jsonData; + YhdjDetailTwoDTO jsonData; } diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/add/InvoiceAllAddInfoDTO.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/add/InvoiceAllAddInfoTwoDTO.java similarity index 94% rename from jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/add/InvoiceAllAddInfoDTO.java rename to jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/add/InvoiceAllAddInfoTwoDTO.java index 5249333..0e973e4 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/add/InvoiceAllAddInfoDTO.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/add/InvoiceAllAddInfoTwoDTO.java @@ -13,7 +13,7 @@ import java.util.List; * @date 2022年12月09日 17:16 */ @Data -public class InvoiceAllAddInfoDTO { +public class InvoiceAllAddInfoTwoDTO { /** message*/ @Alias("message") @@ -149,13 +149,13 @@ public class InvoiceAllAddInfoDTO { private String xsfyhzh; - List fjxxList; + List fjxxList; - List mxList; + List mxList; - List tdywxx; + List tdywxx; - List ext; + List ext; diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/add/InvoiceAllAddDTO.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/add/InvoiceAllAddTwoDTO.java similarity index 96% rename from jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/add/InvoiceAllAddDTO.java rename to jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/add/InvoiceAllAddTwoDTO.java index 3501231..9e9a629 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/add/InvoiceAllAddDTO.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/add/InvoiceAllAddTwoDTO.java @@ -12,7 +12,7 @@ import javax.validation.constraints.NotEmpty; * @date 2022年12月09日 17:16 */ @Data -public class InvoiceAllAddDTO { +public class InvoiceAllAddTwoDTO { @NotEmpty @ApiModelProperty(value = "true") @@ -35,7 +35,7 @@ public class InvoiceAllAddDTO { @ApiModelProperty(value = "lzfpkj") private String serviceId; - InvoiceAllAddInfoDTO jsonData; + InvoiceAllAddInfoTwoDTO jsonData; // 2023/3/9 新增字段 @ApiModelProperty(value = "放弃享受减按1%征收率原因") diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/add/InvoiceAllAddextDTO.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/add/InvoiceAllAddextTwoDTO.java similarity index 89% rename from jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/add/InvoiceAllAddextDTO.java rename to jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/add/InvoiceAllAddextTwoDTO.java index cfd9149..bef6cff 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/add/InvoiceAllAddextDTO.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/add/InvoiceAllAddextTwoDTO.java @@ -11,7 +11,7 @@ import javax.validation.constraints.NotEmpty; * @date 2022年12月09日 17:16 */ @Data -public class InvoiceAllAddextDTO { +public class InvoiceAllAddextTwoDTO { @NotEmpty @ApiModelProperty(value = "0") diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/add/InvoiceAllAddfjxxListDTO.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/add/InvoiceAllAddfjxxListTwoDTO.java similarity index 91% rename from jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/add/InvoiceAllAddfjxxListDTO.java rename to jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/add/InvoiceAllAddfjxxListTwoDTO.java index f897908..90de97a 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/add/InvoiceAllAddfjxxListDTO.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/add/InvoiceAllAddfjxxListTwoDTO.java @@ -11,7 +11,7 @@ import javax.validation.constraints.NotEmpty; * @date 2022年12月09日 17:16 */ @Data -public class InvoiceAllAddfjxxListDTO { +public class InvoiceAllAddfjxxListTwoDTO { @NotEmpty @ApiModelProperty(value = "附加信息名称") diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/add/InvoiceAllAddmxListDTO.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/add/InvoiceAllAddmxListTwoDTO.java similarity index 97% rename from jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/add/InvoiceAllAddmxListDTO.java rename to jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/add/InvoiceAllAddmxListTwoDTO.java index f266cb6..4e47720 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/add/InvoiceAllAddmxListDTO.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/add/InvoiceAllAddmxListTwoDTO.java @@ -12,7 +12,7 @@ import javax.validation.constraints.NotEmpty; * @date 2022年12月09日 17:16 */ @Data -public class InvoiceAllAddmxListDTO { +public class InvoiceAllAddmxListTwoDTO { /** */ @Alias("price") diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/add/InvoiceAllAddtdywxxDTO.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/add/InvoiceAllAddtdywxxTwoDTO.java similarity index 56% rename from jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/add/InvoiceAllAddtdywxxDTO.java rename to jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/add/InvoiceAllAddtdywxxTwoDTO.java index 6a9fba7..ca9003e 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/add/InvoiceAllAddtdywxxDTO.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/add/InvoiceAllAddtdywxxTwoDTO.java @@ -10,12 +10,12 @@ import java.util.List; * @date 2022年12月09日 17:16 */ @Data -public class InvoiceAllAddtdywxxDTO { +public class InvoiceAllAddtdywxxTwoDTO { - List jzfw; + List jzfw; - List bdcjyzlfw; + List bdcjyzlfw; diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/add/InvoiceAllAddtdywxxbdcjyzlfwDTO.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/add/InvoiceAllAddtdywxxbdcjyzlfwTwoDTO.java similarity index 94% rename from jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/add/InvoiceAllAddtdywxxbdcjyzlfwDTO.java rename to jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/add/InvoiceAllAddtdywxxbdcjyzlfwTwoDTO.java index d083bda..e209d5c 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/add/InvoiceAllAddtdywxxbdcjyzlfwDTO.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/add/InvoiceAllAddtdywxxbdcjyzlfwTwoDTO.java @@ -11,7 +11,7 @@ import javax.validation.constraints.NotEmpty; * @date 2022年12月09日 17:16 */ @Data -public class InvoiceAllAddtdywxxbdcjyzlfwDTO { +public class InvoiceAllAddtdywxxbdcjyzlfwTwoDTO { @NotEmpty @ApiModelProperty(value = "房屋产权证书/不动产权证号码") diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/add/InvoiceAllAddtdywxxjzfwDTO.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/add/InvoiceAllAddtdywxxjzfwTwoDTO.java similarity index 94% rename from jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/add/InvoiceAllAddtdywxxjzfwDTO.java rename to jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/add/InvoiceAllAddtdywxxjzfwTwoDTO.java index 8096a61..1365e0c 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/add/InvoiceAllAddtdywxxjzfwDTO.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/add/InvoiceAllAddtdywxxjzfwTwoDTO.java @@ -11,7 +11,7 @@ import javax.validation.constraints.NotEmpty; * @date 2022年12月09日 17:16 */ @Data -public class InvoiceAllAddtdywxxjzfwDTO { +public class InvoiceAllAddtdywxxjzfwTwoDTO { @NotEmpty @ApiModelProperty(value = "建筑服务发生地") diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/red/AddRedInvoiceDTO.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/red/AddRedInvoiceTwoDTO.java similarity index 96% rename from jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/red/AddRedInvoiceDTO.java rename to jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/red/AddRedInvoiceTwoDTO.java index 8757a2a..6f510ca 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/red/AddRedInvoiceDTO.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/red/AddRedInvoiceTwoDTO.java @@ -5,7 +5,7 @@ import lombok.Data; import javax.validation.constraints.NotEmpty; @Data -public class AddRedInvoiceDTO { +public class AddRedInvoiceTwoDTO { @NotEmpty(message = "发票类型代码不能为空") private String fplxdm; // 发票类型代码