From 86ce1aaf6819a6d62cfba4233219fa4661aacbff Mon Sep 17 00:00:00 2001
From: 刘帅 <rr.iii@qq.com>
Date: 星期一, 21 九月 2026 17:49:55 +0800
Subject: [PATCH] bug：测试问题统一修改
---
cloud-server-course/src/main/java/com/dsh/course/controller/CourseController.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 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..20dd3af 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
@@ -618,10 +618,13 @@
if (ToolUtil.isNotEmpty(data)) {
String stime = data.split(" - ")[0] + " 00:00:00";
String etime = data.split(" - ")[1] + " 23:59:59";
+ // 课程订单没有单独 payTime 字段；已支付订单以创建时间作为支付入账时间。
wrapper.between(CoursePackageOrder::getInsertTime, stime, etime);
}
wrapper.in(CoursePackageOrder::getCoursePackageId, ids);
wrapper.eq(CoursePackageOrder::getPayStatus, 2);
+ wrapper.eq(CoursePackageOrder::getState, 1);
+ wrapper.eq(CoursePackageOrder::getStatus, 1);
ArrayList<Integer> objects = new ArrayList<>();
objects.add(1);
objects.add(2);
@@ -635,9 +638,12 @@
collect.add(-1);
}
//
- List<TCoursePackage> list2 = coursePackageService.list(new LambdaQueryWrapper<TCoursePackage>().in(TCoursePackage::getId, collect));
+ List<TCoursePackage> list2 = coursePackageService.list(new LambdaQueryWrapper<TCoursePackage>()
+ .in(TCoursePackage::getId, collect)
+ .ne(TCoursePackage::getState, 3));
// 课类型
- List<TCoursePackageType> list1 = coursePackageTypeService.list();
+ List<TCoursePackageType> list1 = coursePackageTypeService.list(
+ new LambdaQueryWrapper<TCoursePackageType>().ne(TCoursePackageType::getState, 3));
for (CoursePackageOrder tCoursePackagePayment : list) {
for (TCoursePackage tCoursePackage : list2) {
--
Gitblit v1.7.1