From cfc17d9533350890906e45f197f6dbc5afbe85b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?=
 <8605635+zhang3064194730@user.noreply.gitee.com>
Date: Wed, 27 Nov 2024 15:38:44 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E6=8C=82=E5=8D=95?=
 =?UTF-8?q?=E6=94=AF=E4=BB=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/TbCreditBuyerOrderServiceImpl.java      | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 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 16215bbb..31c2eb68 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
@@ -171,15 +171,15 @@ public class TbCreditBuyerOrderServiceImpl extends ServiceImpl<TbCreditBuyerOrde
         // 账户余额
         BigDecimal accountBalance = creditBuyer.getAccountBalance();
         // 如果有余额的话，从余额里面扣除，没有余额的话，从信用额度里面扣除，余额和信用额度都为0，则不允许挂账，余额+信用额度刚好够支付这笔订单的话需要同时减余额减信用额度
-        if (NumberUtil.isGreaterOrEqual(accountBalance, orderInfo.getPayAmount())) {
+        if (NumberUtil.isGreaterOrEqual(accountBalance, orderInfo.getOrderAmount())) {
             // 减余额
-            creditBuyer.setAccountBalance(NumberUtil.sub(accountBalance, orderInfo.getPayAmount()));
+            creditBuyer.setAccountBalance(NumberUtil.sub(accountBalance, orderInfo.getOrderAmount()));
             tbCreditBuyerMapper.updateById(creditBuyer);
             // 记录还款记录
             TbCreditPaymentRecord record = new TbCreditPaymentRecord();
             record.setCreditBuyerId(creditBuyerId);
             record.setOrderId(orderId);
-            record.setRepaymentAmount(orderInfo.getPayAmount());
+            record.setRepaymentAmount(orderInfo.getOrderAmount());
             record.setPaymentMethod("余额支付");
             record.setPaymentTime(new Date());
             record.setRemark("挂账时余额充足，直接从余额扣除");
@@ -188,7 +188,7 @@ public class TbCreditBuyerOrderServiceImpl extends ServiceImpl<TbCreditBuyerOrde
             TbCreditBuyerOrder entity = new TbCreditBuyerOrder();
             entity.setCreditBuyerId(creditBuyerId);
             entity.setOrderId(orderId);
-            entity.setPaidAmount(orderInfo.getPayAmount());
+            entity.setPaidAmount(orderInfo.getOrderAmount());
             entity.setStatus("paid");
             entity.setLastPaymentTime(new Date());
             entity.setLastPaymentMethod(record.getPaymentMethod());
@@ -219,14 +219,14 @@ public class TbCreditBuyerOrderServiceImpl extends ServiceImpl<TbCreditBuyerOrde
             entity.setLastPaymentMethod(record.getPaymentMethod());
             entity.setRemark(record.getRemark());
             //super.save(entity);
-            orderInfo.setPayAmount(NumberUtil.sub(orderInfo.getPayAmount(), accountBalance));
+            orderInfo.setPayAmount(NumberUtil.sub(orderInfo.getOrderAmount(), accountBalance));
         }
         // 剩余挂账额度
         BigDecimal remainingAmount = creditBuyer.getRemainingAmount();
         // 验证挂账金额是否大于剩余额度
-        boolean greater = NumberUtil.isGreater(orderInfo.getPayAmount(), remainingAmount);
+        boolean greater = NumberUtil.isGreater(orderInfo.getOrderAmount(), remainingAmount);
         if (greater) {
-            throw new BadRequestException(StrUtil.format("{}：￥{}不能大于剩余挂账额度({})", "挂账金额", orderInfo.getPayAmount(), remainingAmount));
+            throw new BadRequestException(StrUtil.format("{}：￥{}不能大于剩余挂账额度({})", "挂账金额", orderInfo.getOrderAmount(), remainingAmount));
         }
         if (entity == null) {
             entity = new TbCreditBuyerOrder();
@@ -237,4 +237,4 @@ public class TbCreditBuyerOrderServiceImpl extends ServiceImpl<TbCreditBuyerOrde
         }
         return super.saveOrUpdate(entity);
     }
-}
\ No newline at end of file
+}