From 1586a03c5ef6334e624e7fa8ffb8a1920750189a Mon Sep 17 00:00:00 2001 From: dongxiaoke <1910333201@qq.com> Date: Tue, 30 May 2023 09:32:56 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AE=80=E7=A8=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/InvoiceAddController.java | 3 - .../com/jianshui/invoice/utils/JcskTest.java | 7 +- .../platform/domain/dto/BillInfoDTO.java | 64 +++++++++++++++++- .../domain/dto/BillInfoDetailDTO.java | 65 +++++++++++++++++++ 4 files changed, 133 insertions(+), 6 deletions(-) create mode 100644 jianshui-platform/src/main/java/com/jianshui/platform/domain/dto/BillInfoDetailDTO.java 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 f99e5d0..ee00c07 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 @@ -47,9 +47,6 @@ public class InvoiceAddController extends BaseController { -// 《======================》 - - diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/utils/JcskTest.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/utils/JcskTest.java index 0cf830e..d4ef8cc 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/utils/JcskTest.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/utils/JcskTest.java @@ -14,10 +14,10 @@ public class JcskTest { public static void main(String[] args) throws Exception { -// String key = "ZWaJUo9tKNKKQTQCryW9dw=="; // 1242 + String key = "ZWaJUo9tKNKKQTQCryW9dw=="; // 1242 // String key = "GAu2XyVU4AYiqzPuoVGi4g=="; // 1245 // String key = "5lkC/Y5cRCtdzeroilBYFw=="; // 1246 - String key = "ubDUJvWWr26KTYHfzz02KA=="; // 1247 +// String key = "ubDUJvWWr26KTYHfzz02KA=="; // 1247 // String key = "kpP/pYUBGWdIRNFswh+1Qg=="; // 1240 @@ -221,6 +221,9 @@ public class JcskTest { "\t}\n" + "}"; + + order= "{\"dqbm\":\"guangdong\",\"serviceId\":\"kshc\",\"async\":true,\"bsrysfzjhm\":\"440823199706182127\",\"nsrsbh\":\"91440101MA5CT3T24L\",\"chyydm\":\"01\",\"yfphm\":\"23442000000077077593\"}"; + System.out.println(order); m = AisinoInvoiceDecryptUtil.encrypt(order, key); System.out.println("-------------------红字申请表上传-控制台-----------------------------"); 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 index e8d4b26..6d9a348 100644 --- 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,11 +1,73 @@ 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 new file mode 100644 index 0000000..de1c3ae --- /dev/null +++ b/jianshui-platform/src/main/java/com/jianshui/platform/domain/dto/BillInfoDetailDTO.java @@ -0,0 +1,65 @@ +package com.jianshui.platform.domain.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + * 单据录入统一入参 + */ +@ApiModel("单据录入详情") +public class BillInfoDetailDTO { + + // 1.增值税普通发票 + + //多条start + // 货物或应税劳务、服务名称 + // 规格型号 + // 单位 + // 数量 + // 单价(含税) + // 金额(含税) + // 税率 + // 税额 + // end + + // 合计金额 + // 合计税额 + // 价税合计(大写) + // 价税合计(小写) + + // 销售方名称 + //销售方纳税人识别号 + // 销售方地址、电话 + // 销售方开户行及账号 + + // 备注 + // 收款人 + // 复核人 + // 开票人 + + + + + + + + + + + + + + + + + + + + + + + + + + +}