From eb754c93037250419eceee17bfb526551e85f173 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 08 十二月 2023 22:06:38 +0800
Subject: [PATCH] 修改报表
---
cloud-server-course/src/main/java/com/dsh/course/controller/CourseController.java | 30 ++++++++++++++++++++----------
1 files changed, 20 insertions(+), 10 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 5e82c62..1d0f34f 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
@@ -62,6 +62,9 @@
@Autowired
private ICoursePackagePaymentConfigService coursePackagePaymentConfigService;
+ @Autowired
+ private ICoursePackageOrderService coursePackageOrderService;
+
/**
* 上/下架 1为上架 2为下架 3为删除
*
@@ -534,25 +537,32 @@
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);
+ }
}
- LambdaQueryWrapper<TCoursePackagePayment> wrapper = new LambdaQueryWrapper<>();
+ LambdaQueryWrapper<CoursePackageOrder> wrapper = new LambdaQueryWrapper<>();
if (ToolUtil.isNotEmpty(data)) {
String stime = data.split(" - ")[0] + " 00:00:00";
String etime = data.split(" - ")[1] + " 23:59:59";
- wrapper.between(TCoursePackagePayment::getInsertTime, stime, etime);
+ wrapper.between(CoursePackageOrder::getInsertTime, stime, etime);
}
- wrapper.in(TCoursePackagePayment::getAppUserId, ids);
- wrapper.eq(TCoursePackagePayment::getPayStatus, 2);
+ 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(TCoursePackagePayment::getPayType, objects);
- List<TCoursePackagePayment> list = coursePackagePaymentService.list(wrapper);
- double v = list.stream().map(TCoursePackagePayment::getCashPayment).reduce(BigDecimal.ZERO, BigDecimal::add).doubleValue();
- List<Integer> collect = list.stream().map(TCoursePackagePayment::getCoursePackageId).collect(Collectors.toList());
+ 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);
}
@@ -561,7 +571,7 @@
// 课类型
List<TCoursePackageType> list1 = coursePackageTypeService.list();
- for (TCoursePackagePayment tCoursePackagePayment : list) {
+ for (CoursePackageOrder tCoursePackagePayment : list) {
for (TCoursePackage tCoursePackage : list2) {
if (tCoursePackagePayment.getCoursePackageId().equals(tCoursePackage.getId())) {
tCoursePackagePayment.setType(tCoursePackage.getCoursePackageTypeId());
@@ -575,7 +585,7 @@
HashMap<String, Object> objectObjectHashMap = new HashMap<>();
objectObjectHashMap.put("name", tCoursePackageType.getName());
double a = 0;
- for (TCoursePackagePayment tCoursePackagePayment : list) {
+ for (CoursePackageOrder tCoursePackagePayment : list) {
if (tCoursePackagePayment.getType().equals(tCoursePackageType.getId())) {
a += tCoursePackagePayment.getCashPayment().doubleValue();
}
--
Gitblit v1.7.1