From d30da60c4fe5beb018fbb90738d0dff3fdca0299 Mon Sep 17 00:00:00 2001
From: gaoqr <13665037151@163.com>
Date: Fri, 7 Nov 2025 11:13:25 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E8=B5=84=E9=87=91=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E7=BB=9F=E8=AE=A1=E5=87=BD=E6=95=B0=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9Enull=E5=A4=84=E7=90=86=EF=BC=8C=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=E5=A4=84=E7=90=86;2=E3=80=81=E8=BD=AF?=
 =?UTF-8?q?=E4=BB=B6=E8=B4=AD=E4=B9=B0=E8=AE=B0=E5=BD=95=E5=85=A5=E5=8F=82?=
 =?UTF-8?q?=E8=B5=A0=E9=80=81=E6=97=B6=E9=95=BF=E8=A1=A5=E5=85=85=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchase/vo/PurchaseRecordPageReqVO.java  |  3 +++
 .../funds/purchase/PurchaseRecordMapper.java  |  1 +
 .../IncomeExpenseDetailsMapper.xml            |  4 ++--
 .../funds/invoice/InvoiceRecordsMapper.xml    |  5 +++--
 .../mapper/funds/pay/PayOrderMapper.xml       |  2 +-
 .../mapper/funds/purchase/PurchaseMapper.xml  | 20 +++++++++----------
 6 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/purchase/vo/PurchaseRecordPageReqVO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/purchase/vo/PurchaseRecordPageReqVO.java
index 6f1f91c2f..ee45fb35b 100644
--- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/purchase/vo/PurchaseRecordPageReqVO.java
+++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/purchase/vo/PurchaseRecordPageReqVO.java
@@ -37,6 +37,9 @@ public class PurchaseRecordPageReqVO extends PageParam {
     @Schema(description = "购买时长")
     private Integer purchaseDuration;
 
+    @Schema(description = "赠送时长")
+    private Integer giftDuration;
+
 
     @Schema(description = "购买时间", example = "[2022-07-01 01:01:01 ,2022-07-01 01:01:01]")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/funds/purchase/PurchaseRecordMapper.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/funds/purchase/PurchaseRecordMapper.java
index e9acd1038..3b840086b 100644
--- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/funds/purchase/PurchaseRecordMapper.java
+++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/funds/purchase/PurchaseRecordMapper.java
@@ -47,6 +47,7 @@ public interface PurchaseRecordMapper extends BaseMapperX<PurchaseRecordDO> {
                 .likeIfPresent(PurchaseRecordDO::getProductName, pageReqVO.getProductName())
                 .likeIfPresent(PurchaseRecordDO::getId, pageReqVO.getId())
                 .eqIfPresent(PurchaseRecordDO::getPurchaseDuration, pageReqVO.getPurchaseDuration())
+                .eqIfPresent(PurchaseRecordDO::getGiftDuration, pageReqVO.getGiftDuration())
                 .betweenIfPresent(PurchaseRecordDO::getCreateTime, pageReqVO.getCreateTime())
                 .likeIfPresent(PurchaseRecordDO::getCreator, pageReqVO.getCreator())
                 .eqIfPresent(PurchaseRecordDO::getTotalAmount, pageReqVO.getProductPrice())
diff --git a/cf-module-system/cf-module-system-biz/src/main/resources/mapper/funds/incomeandexpense/IncomeExpenseDetailsMapper.xml b/cf-module-system/cf-module-system-biz/src/main/resources/mapper/funds/incomeandexpense/IncomeExpenseDetailsMapper.xml
index cfd6cc881..9d904c780 100644
--- a/cf-module-system/cf-module-system-biz/src/main/resources/mapper/funds/incomeandexpense/IncomeExpenseDetailsMapper.xml
+++ b/cf-module-system/cf-module-system-biz/src/main/resources/mapper/funds/incomeandexpense/IncomeExpenseDetailsMapper.xml
@@ -18,7 +18,7 @@
 
     <select id="selectOrganIncomeExpenseTrendGroupByCreateTime"
             resultType="com.cf.imes.module.system.controller.admin.funds.organamount.vo.OrganAmountGroupByCreateTimeRespVO">
-        select sum(amount) as amount
+        select COALESCE(sum(amount) ,0) as amount
         <include refid="dateFormat"/>
         from income_expense_details
         where create_time between #{req.createTime[0]} and #{req.createTime[1]}
@@ -31,7 +31,7 @@
 
     <select id="selectTotalSalesTrendGroupByCreateTime"
             resultType="com.cf.imes.module.system.dal.dataobject.funds.statistics.FundsTradeTypeGroupStatisticsDO">
-        select sum(amount) as amount
+        select COALESCE(sum(amount) ,0) as amount
         <include refid="dateFormat"/>
         from income_expense_details
         where create_time between #{req.createTime[0]} and #{req.createTime[1]}
diff --git a/cf-module-system/cf-module-system-biz/src/main/resources/mapper/funds/invoice/InvoiceRecordsMapper.xml b/cf-module-system/cf-module-system-biz/src/main/resources/mapper/funds/invoice/InvoiceRecordsMapper.xml
index 3d8777981..ab00f27e1 100644
--- a/cf-module-system/cf-module-system-biz/src/main/resources/mapper/funds/invoice/InvoiceRecordsMapper.xml
+++ b/cf-module-system/cf-module-system-biz/src/main/resources/mapper/funds/invoice/InvoiceRecordsMapper.xml
@@ -2,8 +2,9 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.cf.imes.module.system.dal.mysql.funds.invoice.InvoiceRecordsMapper">
     <select id="getManageInvoiceAmountStatistics" resultType="com.cf.imes.module.system.controller.admin.funds.invoice.vo.InvoiceAmountRespVO">
-        select sum(case when status = '${@com.cf.imes.module.system.enums.pay.InvoiceStatusEnum@PENDINGINVOICING.code}' then invoice_amount else 0 end) as pendingInvoice,
-               sum(case when status = '${@com.cf.imes.module.system.enums.pay.InvoiceStatusEnum@INVOICINGSUCCESSFUL.code}' then invoice_amount else 0 end) as invoiced
+        select COALESCE(sum(case when status = '${@com.cf.imes.module.system.enums.pay.InvoiceStatusEnum@PENDINGINVOICING.code}' then invoice_amount else 0 end), 0) as pendingInvoice,
+               COALESCE(sum(case when status = '${@com.cf.imes.module.system.enums.pay.InvoiceStatusEnum@INVOICINGSUCCESSFUL.code}' then invoice_amount else 0 end), 0) as invoiced
         from invoice_records
+        where deleted = false
     </select>
 </mapper>
\ No newline at end of file
diff --git a/cf-module-system/cf-module-system-biz/src/main/resources/mapper/funds/pay/PayOrderMapper.xml b/cf-module-system/cf-module-system-biz/src/main/resources/mapper/funds/pay/PayOrderMapper.xml
index 13157a72e..977df1a96 100644
--- a/cf-module-system/cf-module-system-biz/src/main/resources/mapper/funds/pay/PayOrderMapper.xml
+++ b/cf-module-system/cf-module-system-biz/src/main/resources/mapper/funds/pay/PayOrderMapper.xml
@@ -3,7 +3,7 @@
 <mapper namespace="com.cf.imes.module.system.dal.mysql.pay.PayOrderMapper">
 
     <select id="getRechargeTotalAmount" resultType="java.math.BigDecimal">
-        select sum(price) from pay_order
+        select COALESCE(sum(price) ,0) from pay_order
         where status = '${@com.cf.imes.module.system.enums.pay.PayOrderStatusEnum@SUCCESS.status}' and deleted = false
     </select>
 </mapper>
\ No newline at end of file
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 bc97161f1..fc4ffbb08 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
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.cf.imes.module.system.dal.mysql.funds.purchase.PurchaseRecordMapper">
     <select id="getInvoicingAmount" resultType="java.math.BigDecimal">
-        SELECT SUM(totalAmount) AS total_spent
+        SELECT COALESCE(SUM(total_amount) ,0) AS total_spent
         FROM purchase_record
         where organ_id = #{organId} and is_invocing = '${@com.cf.imes.module.system.enums.pay.InvoiceStatusEnum@INVOICABLE.code}' and deleted = false and initial != true;
     </select>
@@ -10,35 +10,35 @@
     <!--    查询机构下开票金额统计：可开票、开票中、已开票-->
     <select id="getOrgInvoiceAmountStatistics" resultType="com.cf.imes.module.system.controller.admin.funds.invoice.vo.InvoiceAmountRespVO">
         SELECT
-            SUM(
+            COALESCE(SUM(
                     CASE
                         WHEN is_invocing = '${@com.cf.imes.module.system.enums.pay.InvoiceStatusEnum@INVOICABLE.code}'
                             THEN external_spent
                         ELSE 0
                         END
-            ) AS invocable,
+            ) ,0) AS invocable,
 
-            SUM(
+            COALESCE(SUM(
                     CASE
                         WHEN is_invocing = '${@com.cf.imes.module.system.enums.pay.InvoiceStatusEnum@PENDINGINVOICING.code}'
                             THEN external_spent
                         ELSE 0
                         END
-            ) AS inTheInvoice,
+            ) ,0) AS inTheInvoice,
 
-            SUM(
+            COALESCE(SUM(
                     CASE
                         WHEN is_invocing = '${@com.cf.imes.module.system.enums.pay.InvoiceStatusEnum@INVOICINGSUCCESSFUL.code}'
                             THEN external_spent
                         ELSE 0
                         END
-            ) AS invoiced
+            ) ,0) AS invoiced
         from purchase_record
         where organ_id = #{organId} and deleted = false and initial != true;
     </select>
 
     <select id="getInvoicableAmount" resultType="java.math.BigDecimal">
-        select sum(external_spent) from purchase_record
+        select COALESCE(sum(external_spent) ,0) from purchase_record
         where organ_id = #{organId} and is_invocing = '${@com.cf.imes.module.system.enums.pay.InvoiceStatusEnum@INVOICABLE.code}'
         and id in
         <foreach collection="ids" item="id" open="(" close=")" separator=",">
@@ -50,7 +50,7 @@
     <select id="getTotalSales"
             resultType="com.cf.imes.module.system.controller.admin.funds.organamount.vo.TotalSalesAmountRespVO">
         select
-            sum(total_amount) as amount
+            COALESCE(sum(total_amount) ,0) as amount
         from purchase_record
         where deleted = false and initial != true;
     </select>
@@ -58,7 +58,7 @@
     <select id="getTodaySales"
             resultType="java.math.BigDecimal">
         select
-            sum(total_amount) as amount
+            COALESCE(sum(total_amount) ,0) as amount
         from purchase_record
         where deleted = false and initial != true
         and create_time &gt;= CURDATE()