From 127811e086f0b953149361c7b130cc1b931fb28b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?LI-CCONG=5C=E6=9D=8E=E8=81=AA=E8=81=AA?= <1441652193@qq.com>
Date: Thu, 28 Mar 2024 15:40:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9A=E7=82=B9=E3=80=81=E5=88=B0=E7=AB=99?=
 =?UTF-8?q?=E5=9B=9E=E6=94=B6=E8=AE=A2=E5=8D=95=E4=B8=9A=E5=8A=A1=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BDbug=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8Dv5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/cc/yunxi/service/impl/ClientServiceImpl.java | 3 ++-
 .../main/java/cc/yunxi/service/impl/EnterpriseServiceImpl.java | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/nxhs-service/src/main/java/cc/yunxi/service/impl/ClientServiceImpl.java b/nxhs-service/src/main/java/cc/yunxi/service/impl/ClientServiceImpl.java
index 01fe79b..a9eae75 100644
--- a/nxhs-service/src/main/java/cc/yunxi/service/impl/ClientServiceImpl.java
+++ b/nxhs-service/src/main/java/cc/yunxi/service/impl/ClientServiceImpl.java
@@ -49,6 +49,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.security.cert.X509Certificate;
 import java.time.LocalDateTime;
 import java.util.Collections;
@@ -261,7 +262,7 @@ public class ClientServiceImpl extends ServiceImpl<ClientMapper, Client> impleme
         BigDecimal balance = client.getBanlance();
         String remark;
         LocalDateTime now = LocalDateTime.now();
-        String amountStr = String.valueOf(amount.setScale(2));
+        String amountStr = String.valueOf(amount.setScale(2, RoundingMode.HALF_UP));
         if (changeTypeEnum.equals(BalanceChangeTypeEnum.INCOME)) {  // 收入
             balance = balance.add(amount);
             remark = "废品回收结算，收入" + amountStr + "元";
diff --git a/nxhs-service/src/main/java/cc/yunxi/service/impl/EnterpriseServiceImpl.java b/nxhs-service/src/main/java/cc/yunxi/service/impl/EnterpriseServiceImpl.java
index 4bf1228..8de573d 100644
--- a/nxhs-service/src/main/java/cc/yunxi/service/impl/EnterpriseServiceImpl.java
+++ b/nxhs-service/src/main/java/cc/yunxi/service/impl/EnterpriseServiceImpl.java
@@ -21,6 +21,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.time.LocalDateTime;
 
 /**
@@ -88,7 +89,7 @@ public class EnterpriseServiceImpl extends ServiceImpl<EnterpriseMapper, Enterpr
         accountBill.setIncomeAmount(rechargeAmount);
         accountBill.setOrderNumber("0");
 
-        accountBill.setRemark("充值金额" + rechargeAmount.setScale(2) + "元");
+        accountBill.setRemark("充值金额" + rechargeAmount.setScale(2, RoundingMode.HALF_UP) + "元");
         accountBill.setCreatorTime(now);
         accountBillMapper.insert(accountBill);
     }