From b48aadeea1f9ac8764a3a6f295bd53effca8faec Mon Sep 17 00:00:00 2001
From: 刘帅 <rr.iii@qq.com>
Date: 星期一, 21 九月 2026 22:04:09 +0800
Subject: [PATCH] bug：收入类型统计数据bug
---
cloud-server-course/src/main/java/com/dsh/course/controller/CourseController.java | 77 +++++++++++++++++---------------------
1 files changed, 35 insertions(+), 42 deletions(-)
diff --git a/cloud-server-course/src/main/java/com/dsh/course/controller/CourseController.java b/cloud-server-course/src/main/java/com/dsh/course/controller/CourseController.java
index 41f3fae..a6fa3d7 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/controller/CourseController.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/controller/CourseController.java
@@ -32,6 +32,7 @@
import java.io.BufferedReader;
import java.io.PrintWriter;
import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
import java.nio.charset.StandardCharsets;
import java.util.*;
import java.util.stream.Collectors;
@@ -602,50 +603,42 @@
public HashMap<String, Object> queryFee(@RequestBody QueryDataFee queryDataFee) {
HashMap<String, Object> map = new HashMap<>();
String data = queryDataFee.getData();
- List<Integer> ids = queryDataFee.getIds();
- if (ids.size() == 0) {
- ids.add(-1);
- }else{
- List<TCoursePackage> list = coursePackageService.list(new QueryWrapper<TCoursePackage>().in("storeId", ids)
- .ne("status", 4).eq("auditStatus", 2).eq("state", 1));
- ids = list.stream().map(TCoursePackage::getId).collect(Collectors.toList());
- if(ids.size() == 0){
- ids.add(-1);
- }
+ List<Integer> storeIds = queryDataFee.getIds() == null
+ ? new ArrayList<>() : new ArrayList<>(queryDataFee.getIds());
+ if (storeIds.isEmpty()) {
+ storeIds.add(-1);
}
- LambdaQueryWrapper<CoursePackageOrder> wrapper = new LambdaQueryWrapper<>();
+ // 购课记录页使用分表 union 查询。统计也必须使用同一数据源，否则落在
+ // t_course_package_order1~5 的订单（例如测试的 0.01 元订单）不会被统计到。
+ CoursePackagePaymentQuery paymentQuery = new CoursePackagePaymentQuery();
+ paymentQuery.setStoreIds(storeIds);
+ paymentQuery.setPayStatus(2);
+ List<CoursePackagePaymentVO> list = coursePackagePaymentService.listAll(paymentQuery);
+ Date startTime = null;
+ Date endTime = null;
if (ToolUtil.isNotEmpty(data)) {
- String stime = data.split(" - ")[0] + " 00:00:00";
- String etime = data.split(" - ")[1] + " 23:59:59";
- wrapper.between(CoursePackageOrder::getInsertTime, stime, etime);
- }
- wrapper.in(CoursePackageOrder::getCoursePackageId, ids);
- wrapper.eq(CoursePackageOrder::getPayStatus, 2);
- ArrayList<Integer> objects = new ArrayList<>();
- objects.add(1);
- objects.add(2);
- objects.add(5);
- objects.add(6);
- wrapper.in(CoursePackageOrder::getPayType, objects);
- List<CoursePackageOrder> list = coursePackageOrderService.list(wrapper);
- double v = list.stream().map(CoursePackageOrder::getCashPayment).reduce(BigDecimal.ZERO, BigDecimal::add).doubleValue();
- List<Integer> collect = list.stream().map(CoursePackageOrder::getCoursePackageId).collect(Collectors.toList());
- if (collect.size() == 0) {
- collect.add(-1);
- }
- //
- List<TCoursePackage> list2 = coursePackageService.list(new LambdaQueryWrapper<TCoursePackage>().in(TCoursePackage::getId, collect));
- // 课类型
- List<TCoursePackageType> list1 = coursePackageTypeService.list();
-
- for (CoursePackageOrder tCoursePackagePayment : list) {
- for (TCoursePackage tCoursePackage : list2) {
- if (tCoursePackagePayment.getCoursePackageId().equals(tCoursePackage.getId())) {
- tCoursePackagePayment.setType(tCoursePackage.getCoursePackageTypeId());
- }
+ try {
+ SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ startTime = formatter.parse(data.split(" - ")[0] + " 00:00:00");
+ endTime = formatter.parse(data.split(" - ")[1] + " 23:59:59");
+ } catch (Exception ignored) {
+ // 与旧实现一致：页面时间格式异常时不额外限制时间范围。
}
}
+ final Date queryStartTime = startTime;
+ final Date queryEndTime = endTime;
+ list = list.stream()
+ .filter(payment -> payment.getCashPayment() != null)
+ .filter(payment -> queryStartTime == null || payment.getInsertTime() == null
+ || (!payment.getInsertTime().before(queryStartTime)
+ && !payment.getInsertTime().after(queryEndTime)))
+ .collect(Collectors.toList());
+ double v = list.stream().map(CoursePackagePaymentVO::getCashPayment)
+ .reduce(BigDecimal.ZERO, BigDecimal::add).doubleValue();
+ // 课类型
+ List<TCoursePackageType> list1 = coursePackageTypeService.list(
+ new LambdaQueryWrapper<TCoursePackageType>().ne(TCoursePackageType::getState, 3));
ArrayList<HashMap<String, Object>> hashMaps = new ArrayList<>();
@@ -653,9 +646,9 @@
HashMap<String, Object> objectObjectHashMap = new HashMap<>();
objectObjectHashMap.put("name", tCoursePackageType.getName());
double a = 0;
- for (CoursePackageOrder tCoursePackagePayment : list) {
- if (tCoursePackagePayment.getType().equals(tCoursePackageType.getId())) {
- a += tCoursePackagePayment.getCashPayment().doubleValue();
+ for (CoursePackagePaymentVO payment : list) {
+ if (tCoursePackageType.getId().equals(payment.getCoursePackageTypeId())) {
+ a += payment.getCashPayment().doubleValue();
}
}
objectObjectHashMap.put("value", a);
--
Gitblit v1.7.1