From 1f1bd7ff5316241e301827d84edef1ad4df5e898 Mon Sep 17 00:00:00 2001
From: gaoqr <13665037151@163.com>
Date: Mon, 22 Sep 2025 10:28:17 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=85=85=E6=9F=A5=E8=AF=A2=E8=B4=AD?=
 =?UTF-8?q?=E4=B9=B0=E8=AE=B0=E5=BD=95=E7=9A=84=E6=9C=AA=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E6=A0=87=E8=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/funds/purchase/PurchaseServiceImpl.java       | 2 ++
 .../resources/mapper/funds/purchase/PurchaseMapper.xml    | 8 +++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/purchase/PurchaseServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/purchase/PurchaseServiceImpl.java
index 66f2b240a..a834e828c 100644
--- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/purchase/PurchaseServiceImpl.java
+++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/purchase/PurchaseServiceImpl.java
@@ -114,6 +114,8 @@ public class PurchaseServiceImpl implements PurchaseService {
         PurchaseRecordDO purchaseRecordDO = purchaseRecordMapper.selectOne(new LambdaQueryWrapper<PurchaseRecordDO>()
                 .eq(PurchaseRecordDO::getOrganId, organId)
                 .gt(PurchaseRecordDO::getEndTime, LocalDateTime.now())
+                .eq(PurchaseRecordDO::getDeleted, false)
+                .eq(PurchaseRecordDO::getStatus, PurchaseRecordStatusEnum.ACTIVE.getStatus())
                 .orderByDesc(PurchaseRecordDO::getCreateTime)
                 .last("limit 1"));
         if (ObjectUtil.isNotNull(purchaseRecordDO)) {
diff --git a/cf-module-system/cf-module-system-biz/src/main/resources/mapper/funds/purchase/PurchaseMapper.xml b/cf-module-system/cf-module-system-biz/src/main/resources/mapper/funds/purchase/PurchaseMapper.xml
index ad9ad4d2d..ce8083459 100644
--- a/cf-module-system/cf-module-system-biz/src/main/resources/mapper/funds/purchase/PurchaseMapper.xml
+++ b/cf-module-system/cf-module-system-biz/src/main/resources/mapper/funds/purchase/PurchaseMapper.xml
@@ -3,7 +3,7 @@
 <mapper namespace="com.cf.imes.module.system.dal.mysql.funds.purchase.PurchaseRecordMapper">
     <select id="getInvoicingAmount" resultType="java.math.BigDecimal">
         select sum(account_balance_spent) from purchase_record
-        where organ_id = #{organId} and is_invocing = '${@com.cf.imes.module.system.enums.pay.InvoiceStatusEnum@INVOICABLE.code}';
+        where organ_id = #{organId} and is_invocing = '${@com.cf.imes.module.system.enums.pay.InvoiceStatusEnum@INVOICABLE.code}' and deleted = false;;
     </select>
 
     <!--    查询机构下开票金额统计：可开票、开票中、已开票-->
@@ -12,7 +12,7 @@
                sum(case when is_invocing = '${@com.cf.imes.module.system.enums.pay.InvoiceStatusEnum@PENDINGINVOICING.code}' then account_balance_spent else 0 end) as inTheInvoice,
                sum(case when is_invocing = '${@com.cf.imes.module.system.enums.pay.InvoiceStatusEnum@INVOICINGSUCCESSFUL.code}' then account_balance_spent else 0 end) as invoiced
         from purchase_record
-        where organ_id = #{organId}
+        where organ_id = #{organId} and deleted = false;
     </select>
 
     <select id="getInvoicableAmount" resultType="java.math.BigDecimal">
@@ -22,6 +22,7 @@
         <foreach collection="ids" item="id" open="(" close=")" separator=",">
             #{id}
         </foreach>
+        and deleted = false;
     </select>
 
     <select id="getTotalSales"
@@ -29,7 +30,8 @@
         select
             sum(total_amount - gift_money_spent) as amount,
             sum(gift_money_spent) as giftAmount
-        from purchase_record;
+        from purchase_record
+        where deleted = false;
     </select>
 
     <select id="getTotalRechargeUsageAmount" resultType="java.math.BigDecimal">