From a2fd4e984f67433e35e0acf73af37ce73333a88c 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 11:42:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=E6=8C=82=E8=B4=A6=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=E9=80=80=E6=AC=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/TbCreditBuyerOrderServiceImpl.java      | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

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 68077fdf..629d2551 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
@@ -323,10 +323,24 @@ public class TbCreditBuyerOrderServiceImpl extends ServiceImpl<TbCreditBuyerOrde
         record.setRepaymentAmount(NumberUtil.sub(BigDecimal.ZERO, refundAmount));
         record.setPaymentMethod("挂账退款");
         record.setPaymentTime(new Date());
-        record.setRemark(StrUtil.format("挂账订单：{}，申请退款￥{}元，退款金额￥{}元已转移至账户余额，挂账额度已恢复。", orderInfo.getOrderNo(), refundAmount, refundAmount));
+        record.setRemark(StrUtil.format("挂账订单：{}，申请退款￥{}元，退款金额￥{}元已转移至账户余额。", orderInfo.getOrderNo(), refundAmount, refundAmount));
         record.setCreateTime(new Date());
         tbCreditPaymentRecordMapper.insert(record);
         tbCreditBuyerService.updateById(creditBuyer);
+        if ("unpaid".equals(dto.getStatus())) {
+            creditBuyer.setAccountBalance(NumberUtil.sub(creditBuyer.getAccountBalance(), refundAmount));
+            TbCreditPaymentRecord auto = new TbCreditPaymentRecord();
+            auto.setCreditBuyerId(creditBuyerId);
+            auto.setOrderId(orderId);
+            auto.setRepaymentAmount(refundAmount);
+            auto.setPaymentMethod("自动还款");
+            auto.setPaymentTime(new Date());
+            auto.setRemark(StrUtil.format("挂账订单：{}，归还欠款￥{}元，挂账额度已恢复。", orderInfo.getOrderNo(), refundAmount, refundAmount));
+            auto.setCreateTime(new Date());
+            tbCreditPaymentRecordMapper.insert(auto);
+            tbCreditBuyerService.updateById(creditBuyer);
+            return true;
+        }
         // 3.修正挂账订单已还款数据
         dto.setPaidAmount(NumberUtil.sub(dto.getPaidAmount(), refundAmount));
         if (NumberUtil.equals(dto.getPaidAmount(), BigDecimal.ZERO)) {