销项合并新增接口合并

2 years ago · 74ea6b0565
parent 226e62e508
commit 74ea6b0565
8 changed files with 416 additions and 18 deletions
--- 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
@ -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;
+
+
+}
--- 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
@ -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;
+
+
+}
--- 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
@ -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;
+
+
+
+
+
+
+
+
+}
--- 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
@ -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<InvoiceAllRedInvoiceDetailChildVO> hzqrxxmxList;
+
+
+
+}
--- 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
@ -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;
+
+
+
+
+
+
+
+
+}
--- 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
@ -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<InvoiceAllRedInvoiceDetailChildVO> hzqrxxmxList;
+
+
+
+}
--- 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);
--- 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);
            }