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 b974ad89..3c3d3b91 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 @@ -387,6 +387,10 @@ public class InvoiceConfig { public String configQueryNsrXnsbxx() { return interfaceA9BusinessUrl + "/invoice/business/v1.0/queryNsrXnsbxx"; } + + public String configQueryNsrXnsbxx2() { + return interfaceJdcBusinessUrl + "/invoice/business/v1.0/queryNsrXnsbxx"; + } /** * 打印机列表查询 @@ -1211,6 +1215,9 @@ public class InvoiceConfig { public String configFileDownload() { return interfaceQdUrl + "/einvoice-api/api/invoice/V1.0/fileDownload"; } - - + + + public String configGetDiscInfoFg2() { + return interfaceJdcBusinessUrl + "/invoice/business/v1.0/queryDiscinfo"; + } } diff --git a/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/service/impl/UnifyServiceImpl.java b/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/service/impl/UnifyServiceImpl.java index c7bdd51b..2e4bcefd 100644 --- a/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/service/impl/UnifyServiceImpl.java +++ b/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/service/impl/UnifyServiceImpl.java @@ -239,7 +239,20 @@ public class UnifyServiceImpl implements UnifyService { cpybs = ""; } sldRequest.setCpybs(cpybs); - NsrXnsbxxs nsrXnsbxxs = HttpInvoiceRequestUtil.queryNsrXnsbxx(invoiceConfig.configQueryNsrXnsbxx(), sldRequest, terminalCode); + + String realUrl = invoiceConfig.configQueryNsrXnsbxx(); + String fgSkKpShList = baseServiceConfig.getFgSkKpShList(); + + if (StringUtils.isNotBlank(fgSkKpShList) && StringUtils.isNotBlank(nsrsbh)) { + String[] fgSkKpList = fgSkKpShList.split(ConfigureConstant.STRING_POINT2); + for (String fgSkKp : fgSkKpList) { + if (nsrsbh.equals(fgSkKp)) { + realUrl = invoiceConfig.configQueryNsrXnsbxx2(); + } + } + } + + NsrXnsbxxs nsrXnsbxxs = HttpInvoiceRequestUtil.queryNsrXnsbxx(realUrl, sldRequest, terminalCode); if (ObjectUtil.isNotEmpty(nsrXnsbxxs) && ObjectUtil.isNotEmpty(nsrXnsbxxs.getContent())) { convertToNewTaxFjh(resultList, nsrXnsbxxs.getContent(), nsrsbh, terminalCode); } @@ -747,8 +760,19 @@ public class UnifyServiceImpl implements UnifyService { fgJspxxReqEntity.setJsplx(jspxx); fgJspxxReqEntity.setFpzlDm(fpzldm); + String url = invoiceConfig.configGetDiscInfoFg(); + + if (StringUtils.isNotBlank(fgSkKpShList) && StringUtils.isNotBlank(nsrsbh)) { + String[] fgSkKpList = fgSkKpShList.split(ConfigureConstant.STRING_POINT2); + for (String fgSkKp : fgSkKpList) { + if (nsrsbh.equals(fgSkKp)) { + url = invoiceConfig.configGetDiscInfoFg2(); + } + } + } + SpFpXeDto spFpXeDto = HttpInvoiceRequestUtilFg.querySpZlXeByNsrsbh( - invoiceConfig.configGetDiscInfoFg(), fgJspxxReqEntity, terminalCode); + url, fgJspxxReqEntity, terminalCode); List taxpayerMachineInfoList = new ArrayList<>(); if (ObjectUtil.isNotNull(spFpXeDto)) { if (ConfigureConstant.STRING_0000.equals(spFpXeDto.getCode()) && ObjectUtil.isNotNull(spFpXeDto.getData())) {