From e9fc87be125dd704a7b7402f0403779b65cd9fec Mon Sep 17 00:00:00 2001 From: kk <1910333201@qq.com> Date: Thu, 12 Oct 2023 15:44:09 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=BA=E5=8A=A8=E8=BD=A6=E5=8A=A0=E5=AF=86?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../config/properties/DruidProperties.java | 6 ++--- .../console/AisinoConsoleConstants.java | 3 +++ .../AisinoInvoiceRequestAdapterImpl.java | 1 + .../AisinoConsoleInvoiceApiServiceImpl.java | 27 ++++++++++++------- 4 files changed, 25 insertions(+), 12 deletions(-) diff --git a/jianshui-framework/src/main/java/com/jianshui/framework/config/properties/DruidProperties.java b/jianshui-framework/src/main/java/com/jianshui/framework/config/properties/DruidProperties.java index e774022..5fac4bb 100644 --- a/jianshui-framework/src/main/java/com/jianshui/framework/config/properties/DruidProperties.java +++ b/jianshui-framework/src/main/java/com/jianshui/framework/config/properties/DruidProperties.java @@ -48,8 +48,8 @@ public class DruidProperties @Value("${spring.datasource.druid.testOnReturn}") private boolean testOnReturn; - @Value("${publicKey}") - private String publicKey; +// @Value("${publicKey}") +// private String publicKey; public DruidDataSource dataSource(DruidDataSource datasource) { /** 配置初始化大小、最小、最大 */ datasource.setInitialSize(initialSize); @@ -77,7 +77,7 @@ public class DruidProperties /** 归还连接时执行validationQuery检测连接是否有效，做了这个配置会降低性能。 */ datasource.setTestOnReturn(testOnReturn); - // TODO: 2023/10/11 不加密版本 + // TODO: 2023/10/11 不加密版本 /*Properties properties = new Properties(); properties.setProperty("config.decrypt","true"); properties.setProperty("config.decrypt.key",publicKey); diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/constant/aisino/console/AisinoConsoleConstants.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/constant/aisino/console/AisinoConsoleConstants.java index f2eacf4..a3d1c99 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/constant/aisino/console/AisinoConsoleConstants.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/constant/aisino/console/AisinoConsoleConstants.java @@ -34,6 +34,9 @@ public class AisinoConsoleConstants { /** 23.红字信息表下载*/ public static final Integer RED_DOWLOAD = 34; + /** 机动车发票加密数据导出 SID=52 */ + public static final Integer VEHIC = 52; + diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/adapter/request/AisinoInvoiceRequestAdapterImpl.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/adapter/request/AisinoInvoiceRequestAdapterImpl.java index 95bffaa..20b002a 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/adapter/request/AisinoInvoiceRequestAdapterImpl.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/adapter/request/AisinoInvoiceRequestAdapterImpl.java @@ -103,6 +103,7 @@ public class AisinoInvoiceRequestAdapterImpl implements IInvoiceRequestService { // 平台解密 try { // TODO: 2023/9/20 + // order = AisinoInvoiceDecryptUtil.decrypt(order, JKey); } catch (Exception e) { e.printStackTrace(); diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/AisinoConsoleInvoiceApiServiceImpl.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/AisinoConsoleInvoiceApiServiceImpl.java index 3b099c8..7e1c566 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/AisinoConsoleInvoiceApiServiceImpl.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/AisinoConsoleInvoiceApiServiceImpl.java @@ -997,17 +997,21 @@ public class AisinoConsoleInvoiceApiServiceImpl implements IInvoiceApiService { public HXResponse exportVehicleInvoice(JSONObject decryptResult, Companyservice companyservice) { // TODO: 2023/10/10 机动车 - + /** + * { + * "SavePath":"C://", + * "FPZL":"", + * "KSRQ":"", + * "StrGuid":"" + * } + */ - /*// 发起请求 + // 发起请求 AjaxResult ajaxResult = null; try { - //hutool的beancopy别名会与JSONUTIl冲突 - Map map = BeanToMapUtils.fastJsonBean2Map(aisinoConsoleInvoiceAddDTO); - map.put("invoiceItems", listMap); - ajaxResult = AisinoConsoleUtil.sendRequest(AisinoConsoleConstants.INVOICE_ADD, JSONUtil.parse(map), companyservice); + ajaxResult = AisinoConsoleUtil.sendRequest(AisinoConsoleConstants.VEHIC, JSONUtil.parse(decryptResult), companyservice); } catch (Exception e) { - log.error("【销项发票】【总部控制台接口】【发票开具】发票请求异常，请求报文{}，销方信息{}", JSONUtil.parse(aisinoConsoleInvoiceAddDTO).toString(), JSONObject.toJSONString(companyservice)); + log.error("【销项发票】【总部控制台接口】【机动车加密】发票请求异常，请求报文{}，销方信息{}", JSONUtil.parse(decryptResult).toString(), JSONObject.toJSONString(companyservice)); e.printStackTrace(); throw new JianshuiServiceException("系统异常！"); } @@ -1020,9 +1024,14 @@ public class AisinoConsoleInvoiceApiServiceImpl implements IInvoiceApiService { cn.hutool.json.JSONObject resultJSON = JSONUtil.parseObj(ajaxResult.get("data")); String retcode = resultJSON.get("retcode") != null ? resultJSON.get("retcode").toString() : ""; - String retmsg = resultJSON.get("retmsg") != null ? resultJSON.get("retmsg").toString() : "";*/ + String retmsg = resultJSON.get("retmsg") != null ? resultJSON.get("retmsg").toString() : ""; + + if("0".equals(retcode)){ + return new HXResponse("0000","导出成功！"); + }else { + return new HXResponse("9999","导出失败、发票不存在！"); + } - return null; } @Override