diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java index 28c91063..dce1beaa 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java @@ -556,33 +556,22 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter { } - if ("免税".equals(detail.getString("sl"))) { + if (StringUtils.isBlank(detail.get("sl").toString()) || "免税".equals(detail.get("sl").toString()) || "不征税".equals(detail.get("sl").toString()) + || "***".equals(detail.get("sl").toString())) { taxRateDetail = "0"; snDetailMap.put("taxRate", taxRateDetail); } else { if (StringUtils.isNoneBlank(detail.get("sl").toString())) { - taxRateDetail = detail.get("sl").toString(); - if (!"0".equals(taxRateDetail)) { - if (StringUtils.isNoneBlank(taxRateDetail)) { - int index = taxRateDetail.indexOf("%"); -// if (index > 0) { -// taxRateDetail = taxRateDetail.substring(0, taxRateDetail.length() - 1); -// Float num = Float.parseFloat(taxRateDetail); -// if (num > 9) { -// taxRateDetail = "0." + taxRateDetail; -// } else { -// if (!taxRateDetail.startsWith("0")) { -// taxRateDetail = "0.0" + taxRateDetail; -// } -// } -// } - } + taxRate = detail.get("sl").toString(); + if (!"0".equals(taxRate)) { + taxRate = taxRate.substring(0, taxRate.length() - 1); } - - if ("11".equals(invoiceType)) { - taxRateDetail = "0"; + //按照小数处理 + if(StringUtils.isNotBlank(isInteger)){ + BigDecimal bigDecimal = new BigDecimal(taxRate); + taxRate = bigDecimal.divide(new BigDecimal("100")).toPlainString(); } - log.info("明细-发票税率为:{}", taxRateDetail); + log.info("明细-发票税率为:{}", taxRate); snDetailMap.put("taxRate", taxRateDetail); } }