|
|
|
@ -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<TaxpayerMachineInfo> taxpayerMachineInfoList = new ArrayList<>(); |
|
|
|
|
if (ObjectUtil.isNotNull(spFpXeDto)) { |
|
|
|
|
if (ConfigureConstant.STRING_0000.equals(spFpXeDto.getCode()) && ObjectUtil.isNotNull(spFpXeDto.getData())) { |
|
|
|
|