From 81172f56f69106cc22193a815ffa3fd3bd7f838d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=AD=E5=87=AF=E5=87=AF?= <tankaikai@aliyun.com>
Date: Tue, 26 Nov 2024 17:50:41 +0800
Subject: [PATCH] =?UTF-8?q?fix=E9=85=8D=E7=BD=AEpad=E7=AB=AF=E8=8F=9C?=
 =?UTF-8?q?=E5=93=81bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mybatis/service/impl/TbCreditBuyerServiceImpl.java     | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/service/impl/TbCreditBuyerServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/service/impl/TbCreditBuyerServiceImpl.java
index b2819e82..de4064df 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/service/impl/TbCreditBuyerServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/service/impl/TbCreditBuyerServiceImpl.java
@@ -65,9 +65,9 @@ public class TbCreditBuyerServiceImpl extends ServiceImpl<TbCreditBuyerMapper, T
             if ("unpaid".equals(repaymentStatus)) {
                 wrapper.apply("0 < ifnull((select x.count from view_credit_buyer_order_count x where x.credit_buyer_id = tb_credit_buyer.id and x.status = 'unpaid'),0)");
                 wrapper.apply("0 = ifnull((select x.count from view_credit_buyer_order_count x where x.credit_buyer_id = tb_credit_buyer.id and x.status = 'partial'),0)");
-            }else if ("partial".equals(repaymentStatus)) {
+            } else if ("partial".equals(repaymentStatus)) {
                 wrapper.apply("0 < ifnull((select x.count from view_credit_buyer_order_count x where x.credit_buyer_id = tb_credit_buyer.id and x.status = 'partial'),0)");
-            }else if ("paid".equals(repaymentStatus)) {
+            } else if ("paid".equals(repaymentStatus)) {
                 wrapper.apply("0 = ifnull((select sum(x.count) from view_credit_buyer_order_count x where x.credit_buyer_id = tb_credit_buyer.id and x.status in ('unpaid','partial')),0)");
             }
         }
@@ -206,6 +206,7 @@ public class TbCreditBuyerServiceImpl extends ServiceImpl<TbCreditBuyerMapper, T
             result.put("repaymentMsg", StrUtil.format("账单无需还款，{}元已转储至余额。", repaymentAmount));
             return result;
         }
+        // 转存余额
         BigDecimal rechargeAmount = BigDecimal.ZERO;
         if (NumberUtil.isGreater(repaymentAmount, owedAmount)) {
             rechargeAmount = NumberUtil.sub(repaymentAmount, owedAmount);
@@ -279,7 +280,7 @@ public class TbCreditBuyerServiceImpl extends ServiceImpl<TbCreditBuyerMapper, T
         result.put("repaymentAmount", initRepaymentAmount);
         result.put("payAmount", payAmount);
         result.put("rechargeAmount", rechargeAmount);
-        result.put("repaymentMsg", StrUtil.format("共计还款{}笔，还款金额：{}元，支付欠款：{}元，转存余额：{}元，当前余额：{}元。", repaymentCount, initRepaymentAmount, payAmount, entity.getAccountBalance()));
+        result.put("repaymentMsg", StrUtil.format("共计还款{}笔，还款金额：{}元，支付欠款：{}元，转存余额：{}元，当前余额：{}元。", repaymentCount, initRepaymentAmount, payAmount, rechargeAmount, entity.getAccountBalance()));
         return result;
     }