From 74180ea20374a0902efdff7f526aa29aba46ad8f Mon Sep 17 00:00:00 2001 From: dongxiaoke <1910333201@qq.com> Date: Wed, 31 May 2023 11:05:03 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=A8=E7=94=B5=E6=8E=A5=E5=8F=A3=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/dto/InvoiceAllFileAcquisitionDTO.java | 8 +------- .../domain/dto/InvoiceAllFileAcquisitionDetailDTO.java | 3 --- .../invoiceall/domain/dto/jcsk/FileAcquisitionDTO.java | 6 ++++-- .../domain/dto/jcsk/FileAcquisitionDetailDTO.java | 1 - .../jianshui/invoiceall/service/impl/InvoiceAllImpl.java | 5 +++++ .../main/java/com/jianshui/invoice/utils/JcskTest.java | 8 +++++++- 6 files changed, 17 insertions(+), 14 deletions(-) diff --git a/jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/domain/dto/InvoiceAllFileAcquisitionDTO.java b/jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/domain/dto/InvoiceAllFileAcquisitionDTO.java index 24b2848..94e304a 100644 --- a/jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/domain/dto/InvoiceAllFileAcquisitionDTO.java +++ b/jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/domain/dto/InvoiceAllFileAcquisitionDTO.java @@ -33,12 +33,6 @@ public class InvoiceAllFileAcquisitionDTO { @ApiModelProperty(value = "*纳税人识别号") private String nsrsbh; - @NotEmpty - @ApiModelProperty(value = "全电发票号码") - private String fphm; - - @NotEmpty - @ApiModelProperty(value = "开票日期,格式：yyyyMMddHHmmss\t") - private String kprq; + private InvoiceAllFileAcquisitionDetailDTO jsonData; } diff --git a/jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/domain/dto/InvoiceAllFileAcquisitionDetailDTO.java b/jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/domain/dto/InvoiceAllFileAcquisitionDetailDTO.java index bc6c1f5..4dfaab8 100644 --- a/jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/domain/dto/InvoiceAllFileAcquisitionDetailDTO.java +++ b/jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/domain/dto/InvoiceAllFileAcquisitionDetailDTO.java @@ -14,15 +14,12 @@ import javax.validation.constraints.NotEmpty; @Data public class InvoiceAllFileAcquisitionDetailDTO { - @NotEmpty @ApiModelProperty(value = "全电发票号码") private String fphm; - @NotEmpty @ApiModelProperty(value = "开票日期") private String kprq; - @NotEmpty @ApiModelProperty(value = "文件格式") private String wjgs; diff --git a/jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/domain/dto/jcsk/FileAcquisitionDTO.java b/jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/domain/dto/jcsk/FileAcquisitionDTO.java index 0d7be15..ffb3e81 100644 --- a/jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/domain/dto/jcsk/FileAcquisitionDTO.java +++ b/jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/domain/dto/jcsk/FileAcquisitionDTO.java @@ -32,13 +32,15 @@ public class FileAcquisitionDTO { @ApiModelProperty(value = "*纳税人识别号") private String nsrsbh; - @NotEmpty + /* @NotEmpty @ApiModelProperty(value = "全电发票号码") private String fphm; @NotEmpty @ApiModelProperty(value = "开票日期,格式：yyyyMMddHHmmss\t") - private String kprq; + private String kprq;*/ + + private FileAcquisitionDetailDTO jsonData; } diff --git a/jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/domain/dto/jcsk/FileAcquisitionDetailDTO.java b/jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/domain/dto/jcsk/FileAcquisitionDetailDTO.java index 69983e6..7fe1951 100644 --- a/jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/domain/dto/jcsk/FileAcquisitionDetailDTO.java +++ b/jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/domain/dto/jcsk/FileAcquisitionDetailDTO.java @@ -22,7 +22,6 @@ public class FileAcquisitionDetailDTO { @ApiModelProperty(value = "开票日期") private String kprq; - @NotEmpty @ApiModelProperty(value = "文件格式") private String wjgs; diff --git a/jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/service/impl/InvoiceAllImpl.java b/jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/service/impl/InvoiceAllImpl.java index eeafbd5..ef32d13 100644 --- a/jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/service/impl/InvoiceAllImpl.java +++ b/jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/service/impl/InvoiceAllImpl.java @@ -328,6 +328,11 @@ public class InvoiceAllImpl implements IInvoiceAll { public AjaxResult getFileUrl(Companyservice companyservice, InvoiceAllFileAcquisitionDTO invoiceAllFileAcquisitionDTO) { FileAcquisitionDTO fileAcquisitionDTO = BeanUtil.copyProperties(invoiceAllFileAcquisitionDTO, FileAcquisitionDTO.class); + if(invoiceAllFileAcquisitionDTO.getJsonData() == null){ + return AjaxResult.error("jsonData不能为空！"); + } + FileAcquisitionDetailDTO fileAcquisitionDetailDTO = BeanUtil.copyProperties(invoiceAllFileAcquisitionDTO.getJsonData(),FileAcquisitionDetailDTO.class); + ValidateUtils.validate(fileAcquisitionDetailDTO); ValidateUtils.validate(fileAcquisitionDTO); JSONObject result = null; 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 d4ef8cc..feb959c 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 @@ -162,7 +162,7 @@ public class JcskTest { " \"async\": false,\n" + " \"bsrysfzjhm\":\"37028519930620441X\",\n" + " \"nsrsbh\": \"92370214MACAAEK16E\",\n" + - " \"requestId\": \"2af023ec-6a08-476a-9f6e-380a0093cbf8\",\n" + + " \"requestId\": \"20230531@c61cadeb-39d6-4c8e-940e-815375056764\",\n" + " \"serviceId\": \"tycxjk\"\n" + "}"; System.out.println(order); @@ -283,7 +283,13 @@ public class JcskTest { System.out.println("------------------------------------------------"); + order = "{\"appkey\":\"GAu2XyVU4AYiqzPuoVGi4g==\",\"async\":true,\"bsrysfzjhm\":\"440823199706182127\",\"dqbm\":\"guangdong\",\"nsrsbh\":\"91440101MA59P8FD4N\",\"serviceId\":\"fpewmxz\",\"jsonData\":{\"fphm\":\"23442000000082558477\",\"kprq\":\"2023-05-31 09:31:01\"},\"fphm\":\"23442000000082558477\",\"kprq\":\"2023-05-31 09:31:01\"}"; + System.out.println(order); + m = AisinoInvoiceDecryptUtil.encrypt(order, key); + System.out.println("-------------------获取发票下载地址-----------------------------"); + System.out.println(m); + System.out.println("------------------------------------------------");