From 74ea6b056536e7fb395bd391f8fcefbc2291bec7 Mon Sep 17 00:00:00 2001 From: dongxiaoke <1910333201@qq.com> Date: Tue, 11 Apr 2023 14:36:06 +0800 Subject: [PATCH] =?UTF-8?q?=E9=94=80=E9=A1=B9=E5=90=88=E5=B9=B6=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E6=8E=A5=E5=8F=A3=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/InvoiceAllRedInvoiceDetailDTO.java | 36 +++++++ ...InvoiceAllRedInvoiceDetailJsonDataDTO.java | 25 +++++ .../vo/InvoiceAllRedInvoiceDetailChildVO.java | 72 ++++++++++++++ .../vo/InvoiceAllRedInvoiceDetailVO.java | 99 +++++++++++++++++++ .../vo/jcsk/RedInvoiceDetailChildVO.java | 72 ++++++++++++++ .../domain/vo/jcsk/RedInvoiceDetailVO.java | 99 +++++++++++++++++++ .../invoiceall/utils/GenVoCodeTest.java | 30 +++--- .../impl/api/JcskInvoiceApiServiceImpl.java | 1 + 8 files changed, 416 insertions(+), 18 deletions(-) create mode 100644 jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/domain/dto/InvoiceAllRedInvoiceDetailDTO.java create mode 100644 jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/domain/dto/InvoiceAllRedInvoiceDetailJsonDataDTO.java create mode 100644 jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/domain/vo/InvoiceAllRedInvoiceDetailChildVO.java create mode 100644 jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/domain/vo/InvoiceAllRedInvoiceDetailVO.java create mode 100644 jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/domain/vo/jcsk/RedInvoiceDetailChildVO.java create mode 100644 jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/domain/vo/jcsk/RedInvoiceDetailVO.java diff --git a/jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/domain/dto/InvoiceAllRedInvoiceDetailDTO.java b/jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/domain/dto/InvoiceAllRedInvoiceDetailDTO.java new file mode 100644 index 0000000..681a489 --- /dev/null +++ b/jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/domain/dto/InvoiceAllRedInvoiceDetailDTO.java @@ -0,0 +1,36 @@ +package com.jianshui.invoiceall.domain.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotEmpty; + +/** + * 查询红字信息表明细 + * @author dxk + * @date 2022年12月09日 17:16 + */ +@Data +public class InvoiceAllRedInvoiceDetailDTO { + + @NotEmpty + @ApiModelProperty(value = "true") + private String async; + + @NotEmpty + @ApiModelProperty(value = "办税人身份证号") + private String bsrysfzjhm; + + @NotEmpty + @ApiModelProperty(value = "地区编码(参考码表)") + private String dqbm; + + @NotEmpty + @ApiModelProperty(value = "纳税人识别号") + private String nsrsbh; + + + private InvoiceAllRedInvoiceDetailJsonDataDTO jsonData; + + +} diff --git a/jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/domain/dto/InvoiceAllRedInvoiceDetailJsonDataDTO.java b/jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/domain/dto/InvoiceAllRedInvoiceDetailJsonDataDTO.java new file mode 100644 index 0000000..e2b5fdf --- /dev/null +++ b/jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/domain/dto/InvoiceAllRedInvoiceDetailJsonDataDTO.java @@ -0,0 +1,25 @@ +package com.jianshui.invoiceall.domain.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotEmpty; + +/** + * 查询红字信息表明细 + * @author dxk + * @date 2022年12月09日 17:16 + */ +@Data +public class InvoiceAllRedInvoiceDetailJsonDataDTO { + + @NotEmpty + @ApiModelProperty(value = "红字发票信息确认单id") + private String hzfpxxqrdid; + + @NotEmpty + @ApiModelProperty(value = "销售方纳税人识别号") + private String xsfnsrsbh; + + +} diff --git a/jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/domain/vo/InvoiceAllRedInvoiceDetailChildVO.java b/jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/domain/vo/InvoiceAllRedInvoiceDetailChildVO.java new file mode 100644 index 0000000..bb994cf --- /dev/null +++ b/jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/domain/vo/InvoiceAllRedInvoiceDetailChildVO.java @@ -0,0 +1,72 @@ +package com.jianshui.invoiceall.domain.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotEmpty; + +/** + * 查询红字信息表明细 + * @author dxk + * @date 2022年12月09日 17:16 + */ +@Data +public class InvoiceAllRedInvoiceDetailChildVO { + + + @NotEmpty + @ApiModelProperty(value = "单位") + private String dw; + + @NotEmpty + @ApiModelProperty(value = "规格型号") + private String ggxh; + + @NotEmpty + @ApiModelProperty(value = "金额") + private String je; + + @NotEmpty + @ApiModelProperty(value = "蓝字明细序号") + private String lzmxxh; + + @NotEmpty + @ApiModelProperty(value = "税额") + private String se; + + @NotEmpty + @ApiModelProperty(value = "税率") + private String slv; + + @NotEmpty + @ApiModelProperty(value = "商品编码") + private String spbm; + + @NotEmpty + @ApiModelProperty(value = "商品单价") + private String spdj; + + @NotEmpty + @ApiModelProperty(value = "商品名称") + private String spmc; + + @NotEmpty + @ApiModelProperty(value = "商品数量") + private String spsl; + + @NotEmpty + @ApiModelProperty(value = "特定征税方式代码") + private String tdzsfsdm; + + @NotEmpty + @ApiModelProperty(value = "序号") + private String xh; + + + + + + + + +} diff --git a/jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/domain/vo/InvoiceAllRedInvoiceDetailVO.java b/jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/domain/vo/InvoiceAllRedInvoiceDetailVO.java new file mode 100644 index 0000000..e3a8a4f --- /dev/null +++ b/jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/domain/vo/InvoiceAllRedInvoiceDetailVO.java @@ -0,0 +1,99 @@ +package com.jianshui.invoiceall.domain.vo; + +import com.jianshui.invoiceall.domain.dto.InvoiceAllRedInvoiceDetailJsonDataDTO; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotEmpty; +import java.util.List; + +/** + * 查询红字信息表明细 + * @author dxk + * @date 2022年12月09日 17:16 + */ +@Data +public class InvoiceAllRedInvoiceDetailVO { + + @NotEmpty + @ApiModelProperty(value = "冲红原因代码") + private String chyydm; + + @NotEmpty + @ApiModelProperty(value = "发票来源代码") + private String fplydm; + + @NotEmpty + @ApiModelProperty(value = "购买方名称") + private String gmfmc; + + @NotEmpty + @ApiModelProperty(value = "购买方税号") + private String gmfnsrsbh; + + @NotEmpty + @ApiModelProperty(value = "红字发票号码") + private String hzfphm; + + @NotEmpty + @ApiModelProperty(value = "红字发票信息确认单编号") + private String hzfpxxqrdbh; + + @NotEmpty + @ApiModelProperty(value = "红字发票信息确认单id") + private String hzfpxxqrdid; + + @NotEmpty + @ApiModelProperty(value = "红字合计金额") + private String hzhjje; + + @NotEmpty + @ApiModelProperty(value = "红字合计税额") + private String hzhjse; + + @NotEmpty + @ApiModelProperty(value = "红字开票日期") + private String hzkprq; + + @NotEmpty + @ApiModelProperty(value = "红字发票信息确认单状态代码") + private String hzqrxxztdm; + + @NotEmpty + @ApiModelProperty(value = "蓝字发票号码") + private String lzfphm; + + @NotEmpty + @ApiModelProperty(value = "蓝字发票类型代码") + private String lzfplxdm; + + @NotEmpty + @ApiModelProperty(value = "蓝字合计金额") + private String lzhjje; + + @NotEmpty + @ApiModelProperty(value = "蓝字合计税额") + private String lzhjse; + + @NotEmpty + @ApiModelProperty(value = "蓝字开票日期") + private String lzkprq; + + @NotEmpty + @ApiModelProperty(value = "申请来源") + private String sqly; + + @NotEmpty + @ApiModelProperty(value = "销售方名称") + private String xsfmc; + + @NotEmpty + @ApiModelProperty(value = "销售方纳税人识别号") + private String xsfnsrsbh; + + + private List hzqrxxmxList; + + + +} diff --git a/jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/domain/vo/jcsk/RedInvoiceDetailChildVO.java b/jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/domain/vo/jcsk/RedInvoiceDetailChildVO.java new file mode 100644 index 0000000..07393ae --- /dev/null +++ b/jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/domain/vo/jcsk/RedInvoiceDetailChildVO.java @@ -0,0 +1,72 @@ +package com.jianshui.invoiceall.domain.vo.jcsk; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotEmpty; + +/** + * 查询红字信息表明细 + * @author dxk + * @date 2022年12月09日 17:16 + */ +@Data +public class RedInvoiceDetailChildVO { + + + @NotEmpty + @ApiModelProperty(value = "单位") + private String dw; + + @NotEmpty + @ApiModelProperty(value = "规格型号") + private String ggxh; + + @NotEmpty + @ApiModelProperty(value = "金额") + private String je; + + @NotEmpty + @ApiModelProperty(value = "蓝字明细序号") + private String lzmxxh; + + @NotEmpty + @ApiModelProperty(value = "税额") + private String se; + + @NotEmpty + @ApiModelProperty(value = "税率") + private String slv; + + @NotEmpty + @ApiModelProperty(value = "商品编码") + private String spbm; + + @NotEmpty + @ApiModelProperty(value = "商品单价") + private String spdj; + + @NotEmpty + @ApiModelProperty(value = "商品名称") + private String spmc; + + @NotEmpty + @ApiModelProperty(value = "商品数量") + private String spsl; + + @NotEmpty + @ApiModelProperty(value = "特定征税方式代码") + private String tdzsfsdm; + + @NotEmpty + @ApiModelProperty(value = "序号") + private String xh; + + + + + + + + +} diff --git a/jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/domain/vo/jcsk/RedInvoiceDetailVO.java b/jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/domain/vo/jcsk/RedInvoiceDetailVO.java new file mode 100644 index 0000000..c387cce --- /dev/null +++ b/jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/domain/vo/jcsk/RedInvoiceDetailVO.java @@ -0,0 +1,99 @@ +package com.jianshui.invoiceall.domain.vo.jcsk; + +import com.jianshui.invoiceall.domain.vo.InvoiceAllRedInvoiceDetailChildVO; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotEmpty; +import java.util.List; + +/** + * 查询红字信息表明细 + * @author dxk + * @date 2022年12月09日 17:16 + */ +@Data +public class RedInvoiceDetailVO { + + @NotEmpty + @ApiModelProperty(value = "冲红原因代码") + private String chyydm; + + @NotEmpty + @ApiModelProperty(value = "发票来源代码") + private String fplydm; + + @NotEmpty + @ApiModelProperty(value = "购买方名称") + private String gmfmc; + + @NotEmpty + @ApiModelProperty(value = "购买方税号") + private String gmfnsrsbh; + + @NotEmpty + @ApiModelProperty(value = "红字发票号码") + private String hzfphm; + + @NotEmpty + @ApiModelProperty(value = "红字发票信息确认单编号") + private String hzfpxxqrdbh; + + @NotEmpty + @ApiModelProperty(value = "红字发票信息确认单id") + private String hzfpxxqrdid; + + @NotEmpty + @ApiModelProperty(value = "红字合计金额") + private String hzhjje; + + @NotEmpty + @ApiModelProperty(value = "红字合计税额") + private String hzhjse; + + @NotEmpty + @ApiModelProperty(value = "红字开票日期") + private String hzkprq; + + @NotEmpty + @ApiModelProperty(value = "红字发票信息确认单状态代码") + private String hzqrxxztdm; + + @NotEmpty + @ApiModelProperty(value = "蓝字发票号码") + private String lzfphm; + + @NotEmpty + @ApiModelProperty(value = "蓝字发票类型代码") + private String lzfplxdm; + + @NotEmpty + @ApiModelProperty(value = "蓝字合计金额") + private String lzhjje; + + @NotEmpty + @ApiModelProperty(value = "蓝字合计税额") + private String lzhjse; + + @NotEmpty + @ApiModelProperty(value = "蓝字开票日期") + private String lzkprq; + + @NotEmpty + @ApiModelProperty(value = "申请来源") + private String sqly; + + @NotEmpty + @ApiModelProperty(value = "销售方名称") + private String xsfmc; + + @NotEmpty + @ApiModelProperty(value = "销售方纳税人识别号") + private String xsfnsrsbh; + + + private List hzqrxxmxList; + + + +} diff --git a/jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/utils/GenVoCodeTest.java b/jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/utils/GenVoCodeTest.java index a5ab651..42f4946 100644 --- a/jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/utils/GenVoCodeTest.java +++ b/jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/utils/GenVoCodeTest.java @@ -16,24 +16,18 @@ public class GenVoCodeTest { public static void main(String[] args) { String json = "{\n" + - " \"chyydm\": \"冲红原因代码\",\n" + - " \"fplydm\": \"发票来源代码\",\n" + - " \"gmfmc\": \"购买方名称\",\n" + - " \"gmfnsrsbh\": \"购买方税号\",\n" + - " \"hzfphm\": \"红字发票号码\",\n" + - " \"hzfpxxqrdbh\": \"红字发票信息确认单编号\",\n" + - " \"hzfpxxqrdid\": \"红字发票信息确认单id\",\n" + - " \"hzfpxxqrdZtdm\": \"红字发票信息确认单状态代码\",\n" + - " \"hzhjje\": \"红字合计金额\",\n" + - " \"hzhjse\": \"红字合计税额\",\n" + - " \"hzkprq\": \"红字开票日期\",\n" + - " \"lzfphm\": \"蓝字发票号码\",\n" + - " \"lzfplxdm\": \"蓝字发票类型代码\",\n" + - " \"lzkprq\": \"蓝字开票日期\",\n" + - " \"lrrq\": \"录入日期\",\n" + - " \"xsfmc\": \"销售方名称\",\n" + - " \"xsfnsrsbh\": \"销售方纳税人识别号\",\n" + - " \"ykjhzfpbz\": \"是否开具红字发票\"\n" + + " \"dw\": \"单位\",\n" + + " \"ggxh\": \"规格型号\",\n" + + " \"je\": \"金额\",\n" + + " \"lzmxxh\": \"蓝字明细序号\",\n" + + " \"se\": \"税额\",\n" + + " \"slv\": \"税率\",\n" + + " \"spbm\": \"商品编码\",\n" + + " \"spdj\": \"商品单价\",\n" + + " \"spmc\": \"商品名称\",\n" + + " \"spsl\": \"商品数量\",\n" + + " \"tdzsfsdm\": \"特定征税方式代码\",\n" + + " \"xh\": \"序号\"\n" + " }"; JSONObject jsonObject = JSONUtil.parseObj(json); diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/JcskInvoiceApiServiceImpl.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/JcskInvoiceApiServiceImpl.java index d8486d8..af41f1d 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/JcskInvoiceApiServiceImpl.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/JcskInvoiceApiServiceImpl.java @@ -486,6 +486,7 @@ public class JcskInvoiceApiServiceImpl implements IInvoiceApiService { } return response; } else { + return new HXResponse(msg); }