From 7b1e719f4b2704108f1621753ad0546df66c9d9d 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, 27 Nov 2024 14:21:22 +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

---
 .../impl/TbCreditBuyerOrderServiceImpl.java     | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 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 5afc8338..4ba73e44 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
@@ -30,10 +30,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * 挂账账单
@@ -86,16 +83,14 @@ public class TbCreditBuyerOrderServiceImpl extends ServiceImpl<TbCreditBuyerOrde
         BigDecimal payAmount = baseMapper.getSumPayAmount(params);
         data.put("payAmountTotal", payAmount);
 
-        // 未支付
-        params.put("status", "unpaid");
+        // 待支付笔数
+        params.put("statusList", Arrays.asList("unpaid","partial"));
         long unpaidCount = baseMapper.getCount(params);
-        // 部分支付
-        params.put("status", "partial");
-        long partialCount = baseMapper.getCount(params);
-        // 待支付笔数 = 未支付笔数 + 部分支付笔数
-        data.put("unpaidCount", unpaidCount + partialCount);
+        data.put("unpaidCount", unpaidCount);
 
+        params.put("statusList", Arrays.asList("paid", "partial"));
         BigDecimal paidAmount = baseMapper.getSumPaidAmount(params);
+        params.put("statusList", Arrays.asList("unpaid", "partial"));
         BigDecimal unpaidAmount = baseMapper.getSumUnpaidAmount(params);
         data.put("paidAmountTotal", paidAmount);
         data.put("unpaidAmountTotal", unpaidAmount);