From cc6a1a8a151dbbd418f041860827a38a6cadc0ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B7=AF=E6=98=8E=E6=85=A7?= <1191093413@qq.com> Date: Wed, 10 Jan 2024 16:10:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B9=E6=A0=BC=E6=B3=A8?= =?UTF-8?q?=E5=86=8C=E6=97=B6=E7=9A=84=E8=B0=83=E7=94=A8url?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/FangGeInterfaceServiceImpl.java | 17 ++++++++++++++++- .../order/invoice/config/InvoiceConfig.java | 6 ++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/FangGeInterfaceServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/FangGeInterfaceServiceImpl.java index 58fc764f..c669d593 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/FangGeInterfaceServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/FangGeInterfaceServiceImpl.java @@ -2241,7 +2241,22 @@ public class FangGeInterfaceServiceImpl implements FangGeInterfaceService { if (OrderInfoEnum.TAX_EQUIPMENT_C48.getKey().equals(terminalCode) || OrderInfoEnum.TAX_EQUIPMENT_D60.getKey().equals(terminalCode)) { terminalCode = OrderInfoEnum.TAX_EQUIPMENT_FGHX.getKey(); } - SqZcxxResponse sqZcxxResponse = HttpInvoiceRequestUtilFg.sqZcxx(invoiceConfig.configSqZcxxFg(), sqZcxxParam, terminalCode); + + String fgSkKpShList = baseServiceConfig.getFgSkKpShList(); + + String url = invoiceConfig.configSqZcxxFg(); + + if (StringUtils.isNotBlank(fgSkKpShList) && StringUtils.isNotBlank(sqZcxxParam.getNSRSBH())) { + String[] fgSkKpList = fgSkKpShList.split(ConfigureConstant.STRING_POINT2); + for (String fgSkKp : fgSkKpList) { + if (sqZcxxParam.getNSRSBH().equals(fgSkKp)) { + url = invoiceConfig.configSqZcxxFg2(); + } + } + } + + SqZcxxResponse sqZcxxResponse = HttpInvoiceRequestUtilFg.sqZcxx(url, sqZcxxParam, terminalCode); + if (ConfigureConstant.STRING_0000.equals(sqZcxxResponse.getCode())) { //注册成功,返回注册码 String zcm = ""; diff --git a/order-management-invoice/src/main/java/com/dxhy/order/invoice/config/InvoiceConfig.java b/order-management-invoice/src/main/java/com/dxhy/order/invoice/config/InvoiceConfig.java index 9a4bfe57..b974ad89 100644 --- a/order-management-invoice/src/main/java/com/dxhy/order/invoice/config/InvoiceConfig.java +++ b/order-management-invoice/src/main/java/com/dxhy/order/invoice/config/InvoiceConfig.java @@ -30,6 +30,9 @@ public class InvoiceConfig { */ @Value("${order.url.A9}") private String interfaceA9BusinessUrl; + + @Value("${order.url.jdc}") + private String interfaceJdcBusinessUrl; /** * 预览pdf水印 @@ -554,6 +557,9 @@ public class InvoiceConfig { public String configSqZcxxFg() { return interfaceA9BusinessUrl + "/invoice/business/v1.0/sqZcxx"; } + public String configSqZcxxFg2() { + return interfaceJdcBusinessUrl + "/invoice/business/v1.0/sqZcxx"; + } /** * 调用获取pdf地址