From 7b302ae1ce0428b664ee813a52e383a2c843eac3 Mon Sep 17 00:00:00 2001 From: dongxiaoke <1910333201@qq.com> Date: Mon, 25 Mar 2024 17:23:58 +0800 Subject: [PATCH] =?UTF-8?q?feature:=20=E6=95=B0=E7=94=B5=E5=BC=80=E7=A5=A8?= =?UTF-8?q?=E7=82=B9=E5=88=A0=E9=99=A4=EF=BC=9B=E6=95=B0=E7=A7=91=E5=9C=B0?= =?UTF-8?q?=E5=9D=80=E5=88=87=E6=8D=A2=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-prod.yml | 3 ++- .../src/main/resources/application.yml | 2 +- .../common/constant/WebServiceConstant.java | 4 ++-- .../api/ElephantInvoiceApiServiceImpl.java | 3 ++- .../com/jianshui/invoice/utils/JcskTest.java | 24 +++++++++++++++++++ 5 files changed, 31 insertions(+), 5 deletions(-) diff --git a/jianshui-admin/src/main/resources/application-prod.yml b/jianshui-admin/src/main/resources/application-prod.yml index 5f3181b..966b6f5 100644 --- a/jianshui-admin/src/main/resources/application-prod.yml +++ b/jianshui-admin/src/main/resources/application-prod.yml @@ -86,7 +86,8 @@ elephant_entcode_check: 91370102MA3UD2FG21 # 文件下载地址 elephant_invoice_file: http://dev.goldentaxcloud.com:8081/invoice/fileUrl/ # 大象V6数电对应平台地址 -ele_url_v6: https://js.ele12.com/order-api +#ele_url_v6: https://js.ele12.com/order-api +ele_url_v6: https:// # 大象纸票服务对应平台地址 ele_url: http://140.143.226.17:8087/order-api ele_url_qz: https://openapi.ele-cloud.com/api/ diff --git a/jianshui-admin/src/main/resources/application.yml b/jianshui-admin/src/main/resources/application.yml index aa11daa..89970ee 100644 --- a/jianshui-admin/src/main/resources/application.yml +++ b/jianshui-admin/src/main/resources/application.yml @@ -46,7 +46,7 @@ spring: # 国际化资源文件路径 basename: i18n/messages profiles: - active: dev + active: prod # 文件上传 servlet: multipart: diff --git a/jianshui-common/src/main/java/com/jianshui/common/constant/WebServiceConstant.java b/jianshui-common/src/main/java/com/jianshui/common/constant/WebServiceConstant.java index 4b23f85..1623cba 100644 --- a/jianshui-common/src/main/java/com/jianshui/common/constant/WebServiceConstant.java +++ b/jianshui-common/src/main/java/com/jianshui/common/constant/WebServiceConstant.java @@ -12,9 +12,9 @@ public class WebServiceConstant { // TODO: 2022/12/13 不能进行测试，先不放上了，别误操作调用了 // TODO: 2023/1/12 所有的接口都用慧永的 - public final static String URL = "https://rocgw.jcsk100.com/external/api"; +// public final static String URL = "https://rocgw.jcsk100.com/external/api"; // 新接口地址 10.29之后原地址将废弃。 -// public final static String URL = "https://roc.jcsk100.com/external/api"; + public final static String URL = "https://roc.jcsk100.com/external/api"; public final static String TOKEN_KEY = "JCSK_YHDJ_"; diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/ElephantInvoiceApiServiceImpl.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/ElephantInvoiceApiServiceImpl.java index f40f92e..0272e03 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/ElephantInvoiceApiServiceImpl.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/ElephantInvoiceApiServiceImpl.java @@ -122,7 +122,8 @@ public class ElephantInvoiceApiServiceImpl implements IInvoiceApiService { // ddpcxx.setKPFS("1"); // 设置开票方式为手动开票 ddpcxx.setDDQQPCH(billInfo.getSystemOrderno()); ddpcxx.setNSRSBH(billInfo.getSellerTaxnum()); - ddpcxx.setKPZD(billInfo.getTerminalNumber()); +// ddpcxx.setKPZD(billInfo.getTerminalNumber()); + ddpcxx.setKPZD(""); // 大象发票类型代码说明 // 增值税专用发票： 004 1 // 增值税普通发票： 007 1 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 24d8770..b57ffbb 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 @@ -266,6 +266,30 @@ public class JcskTest { + order = "{ \n" + + " \"appkey\": \"935248bf224f6c8431cdc1969f029519\",\n" + + " \"async\": false,\n" + + " \"bsrysfzjhm\":\"371723200111024229\",\n" + + " \"serviceId\": \"yhdj\",\n" + + " \"dqbm\": \"shandong\",\n" + + " \"nsrsbh\": \"91370100MA94XWP11G\",\n" + + " \"jsonData\": {\n" + + " \"bsryxm\": \"张雅茹\",\n" + + " \"dlsf\": \"3\",\n" + + " \"dlsfmm\": \"gxhlxh5578045\",\n" + + " \"dlfs\": \"2\",\n" + + " \"dlmm\": \"aa223344\",\n" + + " \"dlzh\": \"15269088559\",\n" + + " \"nsrmc\": \"山东道珉电子商务（集团）有限公司\",\n" + + " \"nsrsbh\": \"91370100MA94XWP11G\",\n" + + " \"bsrysfzjhm\": \"371723200111024229\",\n" + + " \"bsrysjhm\": \"15269088559\",\n" + + " \"zjh\": \"\",\n" + + " \"loginType\": \"1\"\n" + + " }\n" + + "}"; + + System.out.println(order); m = AisinoInvoiceDecryptUtil.encrypt(order, key); System.out.println("-------------------用户登记-----------------------------");