From 2bccc6b024d504d5cafae96e74ec08a8a93a2f7b Mon Sep 17 00:00:00 2001
From: 刘帅 <rr.iii@qq.com>
Date: 星期一, 21 九月 2026 21:56:27 +0800
Subject: [PATCH] bug：收入类型统计数据bug
---
cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackageController.java | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackageController.java b/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackageController.java
index 74c3169..b03944b 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackageController.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackageController.java
@@ -50,6 +50,8 @@
@Resource
private ICoursePackagePaymentConfigService icppconfigService;
+ @Autowired
+ private ICoursePackageOrderService coursePackageOrderService;
@Autowired
@@ -72,8 +74,15 @@
if (courseIds.size() == 0) {
return new ArrayList<>();
} else {
- List<Integer> userIds = tcppmenService.list(new QueryWrapper<TCoursePackagePayment>().in("coursePackageId", courseIds))
+ List<Integer> userIds = tcppmenService.list(new QueryWrapper<TCoursePackagePayment>()
+ .in("coursePackageId", courseIds)
+ .eq("payStatus",2))
.stream().map(TCoursePackagePayment::getAppUserId).collect(Collectors.toList());
+ List<Integer> collect = coursePackageOrderService.list(new QueryWrapper<CoursePackageOrder>()
+ .in("coursePackageId", courseIds)
+ .eq("payStatus", 2)
+ ).stream().map(CoursePackageOrder::getAppUserId).collect(Collectors.toList());
+ userIds.addAll(collect);
return userIds;
}
@@ -242,8 +251,6 @@
StoreOfCourseVo courseVo = new StoreOfCourseVo();
courseVo.setCourseId(coursePackage.getId());
courseVo.setName(coursePackage.getName() + "(" + store.getName() + ")");
-
-
String classStartTime = coursePackage.getClassStartTime();
String classEndTime = coursePackage.getClassEndTime();
ArrayList<String> classTime = new ArrayList<>();
@@ -255,11 +262,8 @@
classTime.add(s);
}
}
-
// coursePackageInfo.setTimes(classTime);
String classTimeAsString = String.join("|", classTime);
-
-
courseVo.setClassStartTime(classTimeAsString);
courseVo.setCoverDrawing(coursePackage.getCoverDrawing());
courseVo.setApplicantsNumber(count);
--
Gitblit v1.7.1