From bdb50299b3cf61a62ae1e28a65a9a77ab5a84473 Mon Sep 17 00:00:00 2001 From: "zhenghaiyang@ele-cloud.com" Date: Mon, 10 Jul 2023 09:08:02 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BC=A0=E5=85=A5=E5=BD=B1?= =?UTF-8?q?=E5=83=8F=E7=B3=BB=E7=BB=9F=E7=A8=8E=E7=8E=87=E4=B8=8D=E4=B8=80?= =?UTF-8?q?=E8=87=B4=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../erp/service/SNPushCheckRecordService.java | 31 ++++++------------- 1 file changed, 10 insertions(+), 21 deletions(-) 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); } }