From 32c2bcddca0134650800e106c8ea7c94166b10e5 Mon Sep 17 00:00:00 2001 From: kk <1910333201@qq.com> Date: Sat, 28 Oct 2023 17:53:45 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=BA=E5=8A=A8=E8=BD=A6=E5=8A=A0=E5=AF=86?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=8E=A5=E5=8F=A3-=E4=BC=81=E4=B8=9A?= =?UTF-8?q?=E7=AE=80=E7=A7=B0=E3=80=81=E5=88=B6=E5=8D=95=E4=BA=BA=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E5=8A=A8=E6=80=81=E5=8F=AF=E9=85=8D=E7=BD=AE=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/配置文件 | 4 +++- ...isinoConsoleInvoiceApiZhongQiServiceImpl.java | 16 ++++++++++++---- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/doc/配置文件 b/doc/配置文件 index 30f7586..f46354f 100644 --- a/doc/配置文件 +++ b/doc/配置文件 @@ -2,4 +2,6 @@ Prop配置文件： aisino_callback_url 重汽回调URL aisino_nginx_url 重汽nginx地址 -aisino_upload_url 重汽上传推送机动车接口 \ No newline at end of file +aisino_upload_url 重汽上传推送机动车接口 +aisino_qyjc 重汽企业名称（合格证推送） +aisino_zdr 重汽制单人（合格证推送） \ No newline at end of file diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/AisinoConsoleInvoiceApiZhongQiServiceImpl.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/AisinoConsoleInvoiceApiZhongQiServiceImpl.java index 6b6b9dd..b3d35de 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/AisinoConsoleInvoiceApiZhongQiServiceImpl.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/AisinoConsoleInvoiceApiZhongQiServiceImpl.java @@ -1114,7 +1114,7 @@ public class AisinoConsoleInvoiceApiZhongQiServiceImpl implements IInvoiceApiSer return new HXResponse("9999","请求参数为空！"); } - // TODO: 2023/10/28 机动车处理 + // TODO: 2023/10/28 机动车加密导出路径配置 exportVehicleDTO.setSavePath("C:\\test\\fileDownload\\"); // 发起请求 @@ -1200,12 +1200,20 @@ public class AisinoConsoleInvoiceApiZhongQiServiceImpl implements IInvoiceApiSer } // InputStream is = new ByteArrayInputStream(fileStream.getBytes()); + CompanyserviceProp qyjc = companyserviceProp.selectPropByKey(companyservice.getCompanyid(), "aisino_qyjc"); + if(qyjc == null || StrUtil.isEmpty(qyjc.getValue())){ + return new HXResponse("9999","重汽推送企业简称未设置！"); + } + CompanyserviceProp zdr = companyserviceProp.selectPropByKey(companyservice.getCompanyid(), "aisino_zdr"); + if(zdr == null || StrUtil.isEmpty(zdr.getValue())){ + return new HXResponse("9999","重汽推送制单人未设置！"); + } + // 调用重汽的推送接口 HashMap paramMap = new HashMap<>(); paramMap.put("file", file); - // TODO: 2023/10/25 调整成可配置的简称 - paramMap.put("qyjc", companyservice.getSellertax()); - paramMap.put("zdr", companyservice.getCompanyid()); + paramMap.put("qyjc", qyjc.getValue()); + paramMap.put("zdr", zdr.getValue()); CompanyserviceProp pushUrl = companyserviceProp.selectPropByKey(companyservice.getCompanyid(), "aisino_upload_url"); if (pushUrl == null || StrUtil.isEmpty(pushUrl.getValue())) {