From c16225c4dacf339f62ef4f1690286c08cb50bfa8 Mon Sep 17 00:00:00 2001 From: yefei Date: Tue, 4 Jul 2023 13:55:38 +0800 Subject: [PATCH] =?UTF-8?q?ariesy=20=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SDNYMainProcessController.java | 33 +++++++----------- .../erp/service/SNPushCheckRecordService.java | 34 +++++++++---------- 2 files changed, 28 insertions(+), 39 deletions(-) diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java b/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java index a954c619..d765ac1d 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java @@ -116,7 +116,7 @@ public class SDNYMainProcessController extends AbstractController { log.info("传入的参数为:{}", pramsMap); String userid = "101833"; String dbName = "business"; - JSONObject checkInvoiceResult = null; + JSONObject checkInvoiceResult = new JSONObject(); //挡板开关 if ("1".equals(isPresure)) { @@ -496,7 +496,7 @@ public class SDNYMainProcessController extends AbstractController { taxRateDetail = "0"; snDetailMap.put("taxRate", taxRateDetail); } else { - if (detail.get("taxRate") != null && StringUtils.isNoneBlank(detail.get("taxRate").toString())) { + if (StringUtils.isNoneBlank(detail.get("taxRate").toString())) { try { taxRateDetail = detail.get("taxRate").toString(); if (!"0".equals(taxRateDetail)) { @@ -504,33 +504,24 @@ public class SDNYMainProcessController extends AbstractController { 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; - } - } - } else { - Float num = Float.parseFloat(taxRateDetail); - if (num > 9) { - taxRateDetail = "0." + taxRateDetail; - } else { - if (!taxRateDetail.startsWith("0")) { - taxRateDetail = "0.0" + taxRateDetail; - } - } +// Float num = Float.parseFloat(taxRateDetail); +// if (num > 9) { +// taxRateDetail = "0." + taxRateDetail; +// } else { +// if (!taxRateDetail.startsWith("0")) { +// taxRateDetail = "0.0" + taxRateDetail; +// } +// } } } } }catch (Exception e){ log.error("报错的原因为:{}",e); - taxRateDetail = "0.00"; + taxRateDetail = "0"; } if ("11".equals(invoiceType)) { - taxRateDetail = "0.000"; + taxRateDetail = "0"; } log.info("明细-发票税率为:{}", taxRateDetail); snDetailMap.put("taxRate", taxRateDetail); 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 4fd03fdf..d72e8764 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 @@ -459,20 +459,18 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter { jsonObject.put("tonnage", invoiceData.get("dw")); jsonObject.put("limitPeople", invoiceData.get("xcrs")); String taxRate = ""; - if (invoiceData.get("sl") == null || StringUtils.isBlank(invoiceData.get("sl").toString()) || - "免税".equals(invoiceData.get("sl").toString()) || "不征税".equals(invoiceData.get("sl").toString()) || "***".equals(invoiceData.get("sl").toString())) { + if (StringUtils.isBlank(invoiceData.get("sl").toString()) || "免税".equals(invoiceData.get("sl").toString()) || "不征税".equals(invoiceData.get("sl").toString()) || "***".equals(invoiceData.get("sl").toString())) { taxRate = "0"; jsonObject.put("taxRate", taxRate); } else { - if (invoiceData.get("sl") != null && StringUtils.isNoneBlank(invoiceData.get("sl").toString())) { + if (StringUtils.isNoneBlank(invoiceData.get("sl").toString())) { taxRate = invoiceData.get("sl").toString(); if (!"0".equals(taxRate)) { - taxRate = "0." + taxRate; taxRate = taxRate.substring(0, taxRate.length() - 1); } if ("11".equals(invoiceType)) { - taxRate = "0.000"; + taxRate = "0"; } log.info("明细-发票税率为:{}", taxRate); jsonObject.put("taxRate", taxRate); @@ -557,27 +555,27 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter { taxRateDetail = "0"; snDetailMap.put("taxRate", taxRateDetail); } else { - if (detail.get("sl") != null && StringUtils.isNoneBlank(detail.get("sl").toString())) { + 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; - } - } - } +// 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; +// } +// } +// } } } if ("11".equals(invoiceType)) { - taxRateDetail = "0.000"; + taxRateDetail = "0"; } log.info("明细-发票税率为:{}", taxRateDetail); snDetailMap.put("taxRate", taxRateDetail);