From c6454d45ed79ca538b10f7ac35c3da8a543138db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=AD=E5=87=AF=E5=87=AF?= <tankaikai@aliyun.com>
Date: Mon, 25 Nov 2024 11:01:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=8C=82=E8=B4=A6=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E7=9B=B8=E5=85=B3=E9=9C=80=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mybatis/mapper/TbCreditBuyerOrderMapper.java   | 14 +++++++++-----
 .../impl/TbCreditBuyerOrderServiceImpl.java        |  5 +++++
 .../mapper/plus/TbCreditBuyerOrderMapper.xml       |  6 ++++++
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbCreditBuyerOrderMapper.java b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbCreditBuyerOrderMapper.java
index 1010a72c..a608b1f7 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbCreditBuyerOrderMapper.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbCreditBuyerOrderMapper.java
@@ -10,18 +10,22 @@ import java.util.List;
 import java.util.Map;
 
 /**
-* 挂账账单
-*
-* @author Tankaikai tankaikai@aliyun.com
-* @since 2.0 2024-11-20
-*/
+ * 挂账账单
+ *
+ * @author Tankaikai tankaikai@aliyun.com
+ * @since 2.0 2024-11-20
+ */
 @Mapper
 public interface TbCreditBuyerOrderMapper extends BaseMapper<TbCreditBuyerOrder> {
 
     List<CreditBuyerOrderDTO> getList(Map<String, Object> params);
+
     long getCount(Map<String, Object> params);
 
+    BigDecimal getSumPayAmount(Map<String, Object> params);
+
     BigDecimal getSumPaidAmount(Map<String, Object> params);
+
     BigDecimal getSumUnpaidAmount(Map<String, Object> params);
 
     CreditBuyerOrderDTO getOne(Map<String, Object> params);
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 1f0136a9..fdd4bc1b 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
@@ -81,6 +81,11 @@ public class TbCreditBuyerOrderServiceImpl extends ServiceImpl<TbCreditBuyerOrde
         Map<String, Object> data = new HashMap<>(4);
         // 总交易笔数
         data.put("count", count);
+
+        // 总交易金额
+        BigDecimal payAmount = baseMapper.getSumPayAmount(params);
+        data.put("payAmountTotal", payAmount);
+
         // 未支付
         params.put("status", "unpaid");
         long unpaidCount = baseMapper.getCount(params);
diff --git a/eladmin-system/src/main/resources/mapper/plus/TbCreditBuyerOrderMapper.xml b/eladmin-system/src/main/resources/mapper/plus/TbCreditBuyerOrderMapper.xml
index d2dc56e4..78d39762 100644
--- a/eladmin-system/src/main/resources/mapper/plus/TbCreditBuyerOrderMapper.xml
+++ b/eladmin-system/src/main/resources/mapper/plus/TbCreditBuyerOrderMapper.xml
@@ -51,6 +51,12 @@
         order by t1.order_id desc
     </select>
 
+    <select id="getSumPayAmount" resultType="decimal">
+        select ifnull(sum(t1.pay_amount),0) from view_credit_buyer_order t1
+        <include refid="commonWhere" />
+        order by t1.order_id desc
+    </select>
+
     <select id="getSumPaidAmount" resultType="decimal">
         select ifnull(sum(t1.paid_amount),0) from view_credit_buyer_order t1
         <include refid="commonWhere" />