添加获取分机号时url判断

release
路明慧 2 years ago
parent cc6a1a8a15
commit ae0b5855ee
  1. 11
      order-management-invoice/src/main/java/com/dxhy/order/invoice/config/InvoiceConfig.java
  2. 28
      order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/service/impl/UnifyServiceImpl.java

@ -387,6 +387,10 @@ public class InvoiceConfig {
public String configQueryNsrXnsbxx() { public String configQueryNsrXnsbxx() {
return interfaceA9BusinessUrl + "/invoice/business/v1.0/queryNsrXnsbxx"; 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() { public String configFileDownload() {
return interfaceQdUrl + "/einvoice-api/api/invoice/V1.0/fileDownload"; return interfaceQdUrl + "/einvoice-api/api/invoice/V1.0/fileDownload";
} }
public String configGetDiscInfoFg2() {
return interfaceJdcBusinessUrl + "/invoice/business/v1.0/queryDiscinfo";
}
} }

@ -239,7 +239,20 @@ public class UnifyServiceImpl implements UnifyService {
cpybs = ""; cpybs = "";
} }
sldRequest.setCpybs(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())) { if (ObjectUtil.isNotEmpty(nsrXnsbxxs) && ObjectUtil.isNotEmpty(nsrXnsbxxs.getContent())) {
convertToNewTaxFjh(resultList, nsrXnsbxxs.getContent(), nsrsbh, terminalCode); convertToNewTaxFjh(resultList, nsrXnsbxxs.getContent(), nsrsbh, terminalCode);
} }
@ -747,8 +760,19 @@ public class UnifyServiceImpl implements UnifyService {
fgJspxxReqEntity.setJsplx(jspxx); fgJspxxReqEntity.setJsplx(jspxx);
fgJspxxReqEntity.setFpzlDm(fpzldm); 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( SpFpXeDto spFpXeDto = HttpInvoiceRequestUtilFg.querySpZlXeByNsrsbh(
invoiceConfig.configGetDiscInfoFg(), fgJspxxReqEntity, terminalCode); url, fgJspxxReqEntity, terminalCode);
List<TaxpayerMachineInfo> taxpayerMachineInfoList = new ArrayList<>(); List<TaxpayerMachineInfo> taxpayerMachineInfoList = new ArrayList<>();
if (ObjectUtil.isNotNull(spFpXeDto)) { if (ObjectUtil.isNotNull(spFpXeDto)) {
if (ConfigureConstant.STRING_0000.equals(spFpXeDto.getCode()) && ObjectUtil.isNotNull(spFpXeDto.getData())) { if (ConfigureConstant.STRING_0000.equals(spFpXeDto.getCode()) && ObjectUtil.isNotNull(spFpXeDto.getData())) {

Loading…
Cancel
Save