From 03308f00da66c618b089b87ac14492592a161d1a Mon Sep 17 00:00:00 2001 From: dongxiaoke <1910333201@qq.com> Date: Mon, 5 Jun 2023 15:38:16 +0800 Subject: [PATCH] =?UTF-8?q?knife4j=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jianshui-admin/pom.xml | 6 ++ .../platform/InvoiceAddController.java | 42 ++------- jianshui-common/pom.xml | 6 ++ .../common/core/domain/AjaxResult.java | 2 + .../platform/domain/dto/BillInfoDTO.java | 94 ------------------- .../domain/dto/BillInfoDetailDTO.java | 65 ------------- .../domain/dto/BillInfoDetailPDTO.java | 46 +++++++++ .../platform/domain/dto/BillInfoPDTO.java | 82 ++++++++++++++++ .../platform/domain/vo/BillInfoPVO.java | 83 ++++++++++++++++ pom.xml | 6 ++ 10 files changed, 241 insertions(+), 191 deletions(-) delete mode 100644 jianshui-platform/src/main/java/com/jianshui/platform/domain/dto/BillInfoDTO.java delete mode 100644 jianshui-platform/src/main/java/com/jianshui/platform/domain/dto/BillInfoDetailDTO.java create mode 100644 jianshui-platform/src/main/java/com/jianshui/platform/domain/dto/BillInfoDetailPDTO.java create mode 100644 jianshui-platform/src/main/java/com/jianshui/platform/domain/dto/BillInfoPDTO.java create mode 100644 jianshui-platform/src/main/java/com/jianshui/platform/domain/vo/BillInfoPVO.java diff --git a/jianshui-admin/pom.xml b/jianshui-admin/pom.xml index 86e4bec..ea5b792 100644 --- a/jianshui-admin/pom.xml +++ b/jianshui-admin/pom.xml @@ -101,6 +101,12 @@ jianshui-invoice-all + + com.jianshui + jianshui-platform + + + diff --git a/jianshui-admin/src/main/java/com/jianshui/web/controller/platform/InvoiceAddController.java b/jianshui-admin/src/main/java/com/jianshui/web/controller/platform/InvoiceAddController.java index a48a715..91ea108 100644 --- a/jianshui-admin/src/main/java/com/jianshui/web/controller/platform/InvoiceAddController.java +++ b/jianshui-admin/src/main/java/com/jianshui/web/controller/platform/InvoiceAddController.java @@ -1,24 +1,13 @@ package com.jianshui.web.controller.platform; -import com.alibaba.fastjson.JSONObject; +import cn.hutool.json.JSON; import com.jianshui.common.core.controller.BaseController; import com.jianshui.common.core.domain.AjaxResult; -import com.jianshui.common.core.domain.entity.Companyservice; -import com.jianshui.common.enums.ErrorCode; -import com.jianshui.common.utils.StringUtils; -import com.jianshui.invoice.domain.dto.HXResponse; -import com.jianshui.invoice.service.IInvoiceApiService; -import com.jianshui.invoice.service.IInvoiceRequestService; -import com.jianshui.invoice.service.IInvoiceResponseService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import javax.servlet.http.HttpServletRequest; +import com.jianshui.platform.domain.dto.BillInfoPDTO; +import com.jianshui.platform.domain.vo.BillInfoPVO; +import io.swagger.annotations.*; +import org.springframework.web.bind.annotation.*; + /** * 发票录入 @@ -30,23 +19,12 @@ import javax.servlet.http.HttpServletRequest; public class InvoiceAddController extends BaseController { - @ApiOperation("单据保存") - @ApiImplicitParams({ - @ApiImplicitParam(name = "identity", value = "身份认证", dataType = "string", example = "1130", required = true), - @ApiImplicitParam(name = "order", value = "请求体", required = true)}) + @ApiOperation(value = "单据保存",notes = "单据保存请求", response = BillInfoPVO.class) @PostMapping( "save") - public AjaxResult invoiceStatistics(HttpServletRequest request, String identity) throws Exception { - - - - - - - - - + public BillInfoPVO invoiceStatistics(@RequestBody BillInfoPDTO billInfoPDTO) throws Exception { + // TODO: 全电-？ - return AjaxResult.success("保存成功"); + return new BillInfoPVO(); } diff --git a/jianshui-common/pom.xml b/jianshui-common/pom.xml index 3ddd358..f116a0e 100644 --- a/jianshui-common/pom.xml +++ b/jianshui-common/pom.xml @@ -154,6 +154,12 @@ 5.8.0.M1 compile + + io.swagger + swagger-annotations + 1.6.6 + compile + diff --git a/jianshui-common/src/main/java/com/jianshui/common/core/domain/AjaxResult.java b/jianshui-common/src/main/java/com/jianshui/common/core/domain/AjaxResult.java index 055bed3..e3dddfc 100644 --- a/jianshui-common/src/main/java/com/jianshui/common/core/domain/AjaxResult.java +++ b/jianshui-common/src/main/java/com/jianshui/common/core/domain/AjaxResult.java @@ -6,6 +6,8 @@ import com.alibaba.fastjson.JSONObject; import com.jianshui.common.constant.HttpStatus; import com.jianshui.common.enums.ErrorCode; import com.jianshui.common.utils.StringUtils; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; /** * 操作消息提醒 diff --git a/jianshui-platform/src/main/java/com/jianshui/platform/domain/dto/BillInfoDTO.java b/jianshui-platform/src/main/java/com/jianshui/platform/domain/dto/BillInfoDTO.java deleted file mode 100644 index 6d9a348..0000000 --- a/jianshui-platform/src/main/java/com/jianshui/platform/domain/dto/BillInfoDTO.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.jianshui.platform.domain.dto; - -import com.jianshui.common.annotation.Excel; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import io.swagger.annotations.ApiOperation; - -/** - * 单据录入统一入参 - */ -@ApiModel("单据录入") -public class BillInfoDTO { - - // 1.增值税普通发票 - @ApiModelProperty(value = "购方名称") - private String buyerName; - - @ApiModelProperty(value = "购方税号") - private String buyerTaxnum; - - @ApiModelProperty(value = "购方地址") - private String buyerAddress; - - /** 购方电话 */ - @ApiModelProperty(value = "购方电话") - private String buyerTelephone; - - @ApiModelProperty(value = "开户行及账号") - private String buyerBank; - - /** 购方开户行及账户 */ - @ApiModelProperty(value = "购买方开户行及账号") - private String buyerAccount; - - @ApiModelProperty(value = "购方邮箱") - private String buyerEmail; - - /** 购方联系电话 */ - @ApiModelProperty(value = "购方联系电话") - private String buyerPhone; - - - //多条start - // 货物或应税劳务、服务名称 - // 规格型号 - // 单位 - // 数量 - // 单价（含税） - // 金额（含税） - // 税率 - // 税额 - // end - - // 合计金额 - // 合计税额 - // 价税合计（大写） - // 价税合计（小写） - - // 销售方名称 - //销售方纳税人识别号 - // 销售方地址、电话 - // 销售方开户行及账号 - - // 备注 - // 收款人 - // 复核人 - // 开票人 - - - - - - - - - - - - - - - - - - - - - - - - - - -} diff --git a/jianshui-platform/src/main/java/com/jianshui/platform/domain/dto/BillInfoDetailDTO.java b/jianshui-platform/src/main/java/com/jianshui/platform/domain/dto/BillInfoDetailDTO.java deleted file mode 100644 index de1c3ae..0000000 --- a/jianshui-platform/src/main/java/com/jianshui/platform/domain/dto/BillInfoDetailDTO.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.jianshui.platform.domain.dto; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; - -/** - * 单据录入统一入参 - */ -@ApiModel("单据录入详情") -public class BillInfoDetailDTO { - - // 1.增值税普通发票 - - //多条start - // 货物或应税劳务、服务名称 - // 规格型号 - // 单位 - // 数量 - // 单价（含税） - // 金额（含税） - // 税率 - // 税额 - // end - - // 合计金额 - // 合计税额 - // 价税合计（大写） - // 价税合计（小写） - - // 销售方名称 - //销售方纳税人识别号 - // 销售方地址、电话 - // 销售方开户行及账号 - - // 备注 - // 收款人 - // 复核人 - // 开票人 - - - - - - - - - - - - - - - - - - - - - - - - - - -} diff --git a/jianshui-platform/src/main/java/com/jianshui/platform/domain/dto/BillInfoDetailPDTO.java b/jianshui-platform/src/main/java/com/jianshui/platform/domain/dto/BillInfoDetailPDTO.java new file mode 100644 index 0000000..d384ff8 --- /dev/null +++ b/jianshui-platform/src/main/java/com/jianshui/platform/domain/dto/BillInfoDetailPDTO.java @@ -0,0 +1,46 @@ +package com.jianshui.platform.domain.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * 单据录入统一入参 + */ +@Data +@ApiModel("单据录入详情") +public class BillInfoDetailPDTO { + + // TODO: 2023/6/5 增值税普通发票 + @ApiModelProperty(value = "商品名称") + private String goodName; + + @ApiModelProperty(value = "规格型号") + private String spec; + + @ApiModelProperty(value = "单位") + private String unit; + + @ApiModelProperty(value = "商品数量") + private BigDecimal num; + + @ApiModelProperty(value = "商品单价") + private BigDecimal price; + + @ApiModelProperty(value = "金额（不含税）") + private BigDecimal taxfreeamt; + + @ApiModelProperty(value = "税率") + private BigDecimal taxrate; + + @ApiModelProperty(value = "税额") + private BigDecimal tax; + + + + + + +} diff --git a/jianshui-platform/src/main/java/com/jianshui/platform/domain/dto/BillInfoPDTO.java b/jianshui-platform/src/main/java/com/jianshui/platform/domain/dto/BillInfoPDTO.java new file mode 100644 index 0000000..5013da7 --- /dev/null +++ b/jianshui-platform/src/main/java/com/jianshui/platform/domain/dto/BillInfoPDTO.java @@ -0,0 +1,82 @@ +package com.jianshui.platform.domain.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.List; + +/** + * 单据录入统一入参 + */ +@Data +@ApiModel("单据录入") +public class BillInfoPDTO { + + // TODO: 2023/6/5 增值税普通发票 + @ApiModelProperty(value = "购方名称") + private String buyerName; + + @ApiModelProperty(value = "购方税号") + private String buyerTaxnum; + + @ApiModelProperty(value = "购方地址") + private String buyerAddress; + + @ApiModelProperty(value = "购方电话") + private String buyerTelephone; + + @ApiModelProperty(value = "开户行及账号") + private String buyerBank; + + @ApiModelProperty(value = "购买方开户行及账号") + private String buyerAccount; + + @ApiModelProperty(value = "购方邮箱") + private String buyerEmail; + + @ApiModelProperty(value = "购方手机号") + private String buyerPhone; + + @ApiModelProperty(value = "销方名称") + private String sellerName; + + @ApiModelProperty(value = "销方税号") + private String sellerTaxnum; + + @ApiModelProperty(value = "销方地址") + private String sellerAddress; + + @ApiModelProperty(value = "销方电话") + private String sellerTelephone; + + @ApiModelProperty(value = "销方开户行及账户") + private String sellerAccount; + + @ApiModelProperty(value = "备注") + private String message; + + @ApiModelProperty(value = "价税合计") + private String jshj; + + @ApiModelProperty(value = "金额（不含税）") + private BigDecimal taxfreeamt; + + @ApiModelProperty(value = "税额") + private BigDecimal tax; + + @ApiModelProperty(value = "开票人") + private String clerk; + + @ApiModelProperty(value = "收款人") + private String payee; + + @ApiModelProperty(value = "复核人") + private String checker; + + @ApiModelProperty(value = "明细") + List billInfoDetailPDTOList; + + +} diff --git a/jianshui-platform/src/main/java/com/jianshui/platform/domain/vo/BillInfoPVO.java b/jianshui-platform/src/main/java/com/jianshui/platform/domain/vo/BillInfoPVO.java new file mode 100644 index 0000000..7ef8527 --- /dev/null +++ b/jianshui-platform/src/main/java/com/jianshui/platform/domain/vo/BillInfoPVO.java @@ -0,0 +1,83 @@ +package com.jianshui.platform.domain.vo; + +import com.jianshui.platform.domain.dto.BillInfoDetailPDTO; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.List; + +/** + * 单据录入统一入参 + */ +@Data +@ApiModel("单据录入") +public class BillInfoPVO { + + // TODO: 2023/6/5 增值税普通发票 + @ApiModelProperty(value = "购方名称") + private String buyerName; + + @ApiModelProperty(value = "购方税号") + private String buyerTaxnum; + + @ApiModelProperty(value = "购方地址") + private String buyerAddress; + + @ApiModelProperty(value = "购方电话") + private String buyerTelephone; + + @ApiModelProperty(value = "开户行及账号") + private String buyerBank; + + @ApiModelProperty(value = "购买方开户行及账号") + private String buyerAccount; + + @ApiModelProperty(value = "购方邮箱") + private String buyerEmail; + + @ApiModelProperty(value = "购方手机号") + private String buyerPhone; + + @ApiModelProperty(value = "销方名称") + private String sellerName; + + @ApiModelProperty(value = "销方税号") + private String sellerTaxnum; + + @ApiModelProperty(value = "销方地址") + private String sellerAddress; + + @ApiModelProperty(value = "销方电话") + private String sellerTelephone; + + @ApiModelProperty(value = "销方开户行及账户") + private String sellerAccount; + + @ApiModelProperty(value = "备注") + private String message; + + @ApiModelProperty(value = "价税合计") + private String jshj; + + @ApiModelProperty(value = "金额（不含税）") + private BigDecimal taxfreeamt; + + @ApiModelProperty(value = "税额") + private BigDecimal tax; + + @ApiModelProperty(value = "开票人") + private String clerk; + + @ApiModelProperty(value = "收款人") + private String payee; + + @ApiModelProperty(value = "复核人") + private String checker; + + @ApiModelProperty(value = "明细") + List billInfoDetailPDTOList; + + +} diff --git a/pom.xml b/pom.xml index d3c0d6c..174aac6 100644 --- a/pom.xml +++ b/pom.xml @@ -227,6 +227,12 @@ ${jianshui.version} + + + com.jianshui + jianshui-platform + ${jianshui.version} +