knife4j调整

2 years ago · 03308f00da
parent 6c5b4a4be7
commit 03308f00da
10 changed files with 241 additions and 191 deletions
--- a/jianshui-admin/pom.xml
+++ b/jianshui-admin/pom.xml
@ -101,6 +101,12 @@
            <artifactId>jianshui-invoice-all</artifactId>
        </dependency>

+        <dependency>
+            <groupId>com.jianshui</groupId>
+            <artifactId>jianshui-platform</artifactId>
+        </dependency>
+
+


    </dependencies>
--- 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();

    }

--- a/jianshui-common/pom.xml
+++ b/jianshui-common/pom.xml
@ -154,6 +154,12 @@
            <version>5.8.0.M1</version>
            <scope>compile</scope>
        </dependency>
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-annotations</artifactId>
+            <version>1.6.6</version>
+            <scope>compile</scope>
+        </dependency>

    </dependencies>

--- 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;

 /**
 * 操作消息提醒
--- 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
@ -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
-
-    //    合计金额
-    //    合计税额
-    //    价税合计（大写）
-    //    价税合计（小写）
-
-    //    销售方名称
-    //销售方纳税人识别号
-    //    销售方地址、电话
-    //    销售方开户行及账号
-
-    //    备注
-    //    收款人
-    //    复核人
-    //    开票人
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-}
--- 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
@ -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
-
-    //    合计金额
-    //    合计税额
-    //    价税合计（大写）
-    //    价税合计（小写）
-
-    //    销售方名称
-    //销售方纳税人识别号
-    //    销售方地址、电话
-    //    销售方开户行及账号
-
-    //    备注
-    //    收款人
-    //    复核人
-    //    开票人
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-}
--- 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
@ -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;
+
+
+    
+
+
+
+}
--- 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
@ -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<BillInfoDetailPDTO> billInfoDetailPDTOList;
+
+
+}
--- 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
@ -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<BillInfoDetailPDTO> billInfoDetailPDTOList;
+
+
+}
--- a/pom.xml
+++ b/pom.xml
@ -227,6 +227,12 @@
                <version>${jianshui.version}</version>
            </dependency>

+            <!-- 简税-产品-前端-->
+            <dependency>
+                <groupId>com.jianshui</groupId>
+                <artifactId>jianshui-platform</artifactId>
+                <version>${jianshui.version}</version>
+            </dependency>
            <!--集成 logstash 日志-->
            <!-- logback -->
            <dependency>