From 328ba81892349e09d21c4806298c1d7db27298e9 Mon Sep 17 00:00:00 2001
From: 刘帅 <rr.iii@qq.com>
Date: 星期五, 18 九月 2026 13:53:29 +0800
Subject: [PATCH] bug:统计数据修改

---
 cloud-server-account/src/main/java/com/dsh/account/controller/StudentController.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/cloud-server-account/src/main/java/com/dsh/account/controller/StudentController.java b/cloud-server-account/src/main/java/com/dsh/account/controller/StudentController.java
index cda182d..3e0b04e 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/controller/StudentController.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/controller/StudentController.java
@@ -1109,10 +1109,11 @@
         if (ToolUtil.isNotEmpty(data)) {
             String stime = data.split(" - ")[0] + " 00:00:00";
             String etime = data.split(" - ")[1] + " 23:59:59";
-            vipPaymentLambdaQueryWrapper.between(VipPayment::getInsertTime, stime, etime);
+            vipPaymentLambdaQueryWrapper.between(VipPayment::getPayTime, stime, etime);
         }
         vipPaymentLambdaQueryWrapper.in(VipPayment::getAppUserId, ids);
         vipPaymentLambdaQueryWrapper.eq(VipPayment::getPayStatus, 2);
+        vipPaymentLambdaQueryWrapper.eq(VipPayment::getState, 1);
         List<VipPayment> list = vipPaymentService.list(vipPaymentLambdaQueryWrapper);
         double sum = list.stream().mapToDouble(VipPayment::getAmount).sum();
 
@@ -1122,10 +1123,11 @@
         if (ToolUtil.isNotEmpty(data)) {
             String stime = data.split(" - ")[0] + " 00:00:00";
             String etime = data.split(" - ")[1] + " 23:59:59";
-            rechargeRecordsLambdaQueryWrapper.between(RechargeRecords::getInsertTime, stime, etime);
+            rechargeRecordsLambdaQueryWrapper.between(RechargeRecords::getPayTime, stime, etime);
         }
         rechargeRecordsLambdaQueryWrapper.in(RechargeRecords::getAppUserId, ids);
         rechargeRecordsLambdaQueryWrapper.eq(RechargeRecords::getPayStatus, 2);
+        rechargeRecordsLambdaQueryWrapper.eq(RechargeRecords::getState, 1);
         List<RechargeRecords> list1 = rechargeRecordsService.list(rechargeRecordsLambdaQueryWrapper);
         double sum1 = list1.stream().map(RechargeRecords::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add).doubleValue();
 

--
Gitblit v1.7.1