From 624c9eec90d59297800f03276f8518daa1bd9f94 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 04 八月 2023 09:23:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-course/src/main/java/com/dsh/course/controller/CancelSourceController.java | 26 ++++++++++++++------------
1 files changed, 14 insertions(+), 12 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 e66f5f1..ae65256 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
@@ -46,19 +46,21 @@
.between("insertTime", sessionList.getStartTime(),sessionList.getEndTime())
.eq("appUserId",sessionList.getAppUserId())
.eq("studentId",sessionList.getStuId()));
- List<Long> coursePackageIds = tCoursePackagePayments.stream().map(TCoursePackagePayment::getId).collect(Collectors.toList());
+ 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 -> {
- 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