From a1f2c8e4d771b185cfc2c152bdac6f5f17c73ba3 Mon Sep 17 00:00:00 2001 From: yefei Date: Tue, 11 Jul 2023 15:18:53 +0800 Subject: [PATCH] =?UTF-8?q?ariesy=20=E4=BF=AE=E6=94=B9=E7=A8=8E=E7=8E=87%?= =?UTF-8?q?=E6=9B=BF=E6=8D=A2=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../erp/service/SNPushCheckRecordService.java | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 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 f0f2be9d..5600153b 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 @@ -535,16 +535,18 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter { snDetailMap.put("tax", "0"); //如果是卷票计算合计金额 - Float hjje = null; - if (StringUtils.isNotEmpty(detail.getString("se")) && StringUtils.isNotEmpty(detail.getString("je"))) { - Float je = Float.parseFloat(detail.getString("je")); - Float se = Float.parseFloat(detail.getString("se")); - hjje = je + se; + String hjje = null; + if (detail.getString("je") != null && detail.getString("se") != null) { + BigDecimal je = new BigDecimal(detail.getString("je")); + if (detail.getString("se") != null) { + hjje = je.add(new BigDecimal(detail.getString("se"))).toPlainString(); + } else { + hjje = je.toPlainString(); + } } - if (hjje != null) - snDetailMap.put("amount", hjje.toString()); - + if (StringUtils.isNotBlank(hjje)) + snDetailMap.put("amount", hjje); } else { snDetailMap.put("tax", "***".equals(detail.getString("se")) ? "0.00" : detail.getString("se")); snDetailMap.put("amount", detail.getString("je"));