From d8410469e997fc9880aeaa82fe9dc1d198395719 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=AD=E5=87=AF=E5=87=AF?= <tankaikai@aliyun.com>
Date: Wed, 11 Dec 2024 17:07:50 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E8=BF=94=E5=9B=9E=E5=BA=97?=
 =?UTF-8?q?=E9=93=BA=E6=8E=88=E6=9D=83=E8=BF=87=E6=9C=9F=E6=97=A5=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/TbCreditBuyerOrderServiceImpl.java   | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/service/impl/TbCreditBuyerOrderServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/service/impl/TbCreditBuyerOrderServiceImpl.java
index b890dd1c..544b916b 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/service/impl/TbCreditBuyerOrderServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/service/impl/TbCreditBuyerOrderServiceImpl.java
@@ -325,22 +325,23 @@ public class TbCreditBuyerOrderServiceImpl extends ServiceImpl<TbCreditBuyerOrde
         record.setCreateTime(new Date());
         tbCreditPaymentRecordMapper.insert(record);
         dto = baseMapper.getOne(params);
-        if (NumberUtil.equals(dto.getPayAmount(), BigDecimal.ZERO) && NumberUtil.isGreater(dto.getPaidAmount(), BigDecimal.ZERO) && NumberUtil.isLess(dto.getUnpaidAmount(), BigDecimal.ZERO)) {
+        BigDecimal sub = NumberUtil.sub(refundAmount, dto.getUnpaidAmount());
+        if (NumberUtil.isGreater(sub, BigDecimal.ZERO)) {
             TbCreditPaymentRecord flow = new TbCreditPaymentRecord();
             flow.setCreditBuyerId(creditBuyerId);
             flow.setOrderId(orderId);
-            flow.setRepaymentAmount(dto.getUnpaidAmount());
+            flow.setRepaymentAmount(NumberUtil.sub(BigDecimal.ZERO, sub));
             flow.setPaymentMethod("挂账退款");
             flow.setPaymentTime(new Date());
-            flow.setRemark(StrUtil.format("挂账订单：{}，申请退款￥{}元，由于此挂账订单已提前还款，溢出部分￥{}元将转储至账户余额。", orderInfo.getOrderNo(), refundAmount, dto.getUnpaidAmount().abs()));
+            flow.setRemark(StrUtil.format("挂账订单：{}，申请退款￥{}元，由于此挂账订单已提前还款，溢出部分￥{}元将转储至账户余额。", orderInfo.getOrderNo(), refundAmount, sub));
             flow.setCreateTime(new Date());
             tbCreditPaymentRecordMapper.insert(flow);
             tbCreditBuyerOrderMapper.update(Wrappers.<TbCreditBuyerOrder>lambdaUpdate()
                     .eq(TbCreditBuyerOrder::getId, dto.getId())
-                    .set(TbCreditBuyerOrder::getPaidAmount, NumberUtil.add(dto.getPaidAmount(), dto.getUnpaidAmount()))
+                    .set(TbCreditBuyerOrder::getPaidAmount, NumberUtil.sub(dto.getPaidAmount(), sub))
             );
             // 退回余额
-            creditBuyer.setAccountBalance(NumberUtil.add(creditBuyer.getAccountBalance(), dto.getUnpaidAmount().abs()));
+            creditBuyer.setAccountBalance(NumberUtil.add(creditBuyer.getAccountBalance(), sub));
             tbCreditBuyerService.updateById(creditBuyer);
         }
         return true;