From aa925d851857f50eff0556411366690d9a78a0e5 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期一, 27 十一月 2023 17:30:26 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
---
cloud-server-course/src/main/java/com/dsh/course/controller/CancelSourceController.java | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 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 bef6424..9ed7373 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
@@ -36,28 +36,29 @@
/**
* 获取课包对应的消费记录
+ *
* @param sessionList
* @return
*/
@PostMapping("/base/cancelSource/cancelList")
- public List<PurchaseRecordVo> getCancelCourseList(@RequestBody GetStuSessionList sessionList){
+ 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){
+ .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<CancelledClasses> list = caceService.list(new QueryWrapper<CancelledClasses>()
.in("coursePackageId", coursePackageIds)
- .between("insertTime",sessionList.getStartTime(),sessionList.getEndTime()));
- if (list.size() > 0){
- list.forEach( canse -> {
+ .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());
+ purchaseRecordVo.setPurchaseAmount("-" + canse.getCancelledClassesNumber());
purchaseRecordVos.add(purchaseRecordVo);
});
}
--
Gitblit v1.7.1