From ee9cb0da4a43bcf523ebb157678f64a2895fba1a Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期二, 10 十月 2023 15:30:38 +0800
Subject: [PATCH] 10.10
---
cloud-server-course/src/main/java/com/dsh/course/controller/CancelSourceController.java | 34 +++++++++++++++++++---------------
1 files changed, 19 insertions(+), 15 deletions(-)
diff --git a/cloud-server-course/src/main/java/com/dsh/course/controller/CancelSourceController.java b/cloud-server-course/src/main/java/com/dsh/course/controller/CancelSourceController.java
index e6e427f..bef6424 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/controller/CancelSourceController.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/controller/CancelSourceController.java
@@ -7,6 +7,7 @@
import com.dsh.course.feignclient.model.GetStuSessionList;
import com.dsh.course.feignclient.model.PurchaseRecordVo;
import com.dsh.course.service.CancelledClassesService;
+import com.dsh.course.service.CourseCounsumService;
import com.dsh.course.service.TCoursePackagePaymentService;
import io.swagger.annotations.Api;
import org.springframework.beans.factory.annotation.Autowired;
@@ -22,7 +23,6 @@
@RestController
@RequestMapping("")
public class CancelSourceController {
-
@Autowired
private CancelledClassesService caceService;
@@ -42,21 +42,25 @@
@PostMapping("/base/cancelSource/cancelList")
public List<PurchaseRecordVo> getCancelCourseList(@RequestBody GetStuSessionList sessionList){
List<PurchaseRecordVo> purchaseRecordVos = new ArrayList<>();
+ List<TCoursePackagePayment> tCoursePackagePayments = tcppService.list(new QueryWrapper<TCoursePackagePayment>()
+ .between("insertTime", sessionList.getStartTime(),sessionList.getEndTime())
+ .eq("appUserId",sessionList.getAppUserId())
+ .eq("studentId",sessionList.getStuId()));
+ if (tCoursePackagePayments.size() > 0){
+ List<Long> coursePackageIds = tCoursePackagePayments.stream().map(TCoursePackagePayment::getId).collect(Collectors.toList());
- List<TCoursePackagePayment> tCoursePackagePayments = tcppService.queryAllCoursePackage(sessionList.getStartTime(),sessionList.getEndTime(),null,sessionList.getStuId(), sessionList.getAppUserId());
- List<Long> coursePackageIds = tCoursePackagePayments.stream().map(TCoursePackagePayment::getId).collect(Collectors.toList());
-
- List<CancelledClasses> list = caceService.list(new QueryWrapper<CancelledClasses>()
- .in("coursePackageId", coursePackageIds)
- .between("insertTime",sessionList.getStartTime(),sessionList.getEndTime()));
- if (list.size() > 0){
- list.forEach( canse -> {
- PurchaseRecordVo purchaseRecordVo = new PurchaseRecordVo();
- purchaseRecordVo.setPurchaseTime(format.format(canse.getInsertTime()));
- purchaseRecordVo.setPurchaseType("");
- purchaseRecordVo.setPurchaseAmount("-"+canse.getCancelledClassesNumber());
- purchaseRecordVos.add(purchaseRecordVo);
- });
+ List<CancelledClasses> list = caceService.list(new QueryWrapper<CancelledClasses>()
+ .in("coursePackageId", coursePackageIds)
+ .between("insertTime",sessionList.getStartTime(),sessionList.getEndTime()));
+ if (list.size() > 0){
+ list.forEach( canse -> {
+ PurchaseRecordVo purchaseRecordVo = new PurchaseRecordVo();
+ purchaseRecordVo.setPurchaseTime(format.format(canse.getInsertTime()));
+ purchaseRecordVo.setPurchaseType("");
+ purchaseRecordVo.setPurchaseAmount("-"+canse.getCancelledClassesNumber());
+ purchaseRecordVos.add(purchaseRecordVo);
+ });
+ }
}
return purchaseRecordVos;
}
--
Gitblit v1.7.1