From d20dbd5d97b3f418533d5d23fd337cdec9f95939 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 14 十二月 2023 09:24:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-course/src/main/java/com/dsh/course/controller/CourseStudentController.java | 49 +++++++++++++++++++++++++------------------------
1 files changed, 25 insertions(+), 24 deletions(-)
diff --git a/cloud-server-course/src/main/java/com/dsh/course/controller/CourseStudentController.java b/cloud-server-course/src/main/java/com/dsh/course/controller/CourseStudentController.java
index 7b2892a..4e064b4 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/controller/CourseStudentController.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/controller/CourseStudentController.java
@@ -67,10 +67,7 @@
@RequestMapping("/getStudentTotal")
@ResponseBody
public List<Map<String, Object>> get(@RequestBody StudentQeryDto studentQeryDto) {
- System.out.println("-====studentQeryDto=========" + studentQeryDto);
List<Map<String, Object>> pays = paymentService.getStudentTotal(studentQeryDto);
- System.out.println("=========pays======" + pays);
-
return pays;
}
@@ -79,18 +76,7 @@
@RequestMapping("/bypac")
@ResponseBody
public List<Map<String, Object>> bypac(@RequestBody PacQueryDto pacQueryDto) {
- System.out.println("-====studentQeryDto=========" + pacQueryDto);
- if (pacQueryDto.getStoreIds() != null && pacQueryDto.getStoreIds().size() != 0) {
- // 根据门店id 查询课包ids
- List<Integer> coursePackageIds = coursePackageService.list(new QueryWrapper<TCoursePackage>()
- .in("storeId", pacQueryDto.getStoreIds())).stream()
- .map(TCoursePackage::getId).collect(Collectors.toList());
- pacQueryDto.setStoreIds(coursePackageIds);
- }
List<Map<String, Object>> pays = paymentService.bypac(pacQueryDto);
-
- System.out.println("=========pays======" + pays);
-
return pays;
}
@@ -310,7 +296,7 @@
List<MoneyBack> ids = moneyBackService.list(new QueryWrapper<MoneyBack>().eq("ids", insertBackDto.getIds()));
- if (ids!=null){
+ if (!ids.isEmpty()){
return 1 ;
}
@@ -329,7 +315,19 @@
for (CoursePackageOrderStudent o : pays) {
o.setStatus(4);
o.setAppUserId(null);
+ List<CoursePackageScheduling> coursePackageSchedulings = coursePackageSchedulingService.selectList(new QueryWrapper<CoursePackageScheduling>().eq("studentId", o.getStudentId()).eq("coursePackageId", o.getCoursePackageId()).ge("classDate", new Date()));
+ List<Long> scs = new ArrayList<>();
+ for (CoursePackageScheduling coursePackageScheduling : coursePackageSchedulings) {
+ scs.add(coursePackageScheduling.getId());
+ }
+ coursePackageStudentService.remove(new QueryWrapper<CoursePackageStudent>().in("coursePackageSchedulingId",scs));
+ coursePackageSchedulingService.deleteBatchIds(scs);
+
+
+
}
+
+
orderStudentService.updateBatchById(pays);
return 0;
@@ -360,6 +358,8 @@
}
+
+
@RequestMapping("/noStatus")
@ResponseBody
public void noStatus(@RequestParam("id") Integer id) {
@@ -371,6 +371,7 @@
for (CoursePackageOrderStudent o : pays) {
o.setStatus(1);
o.setAppUserId(null);
+ schedulingService.addNewCoursePackageScheduling(o.getId(),o.getLaveClassHours());
}
orderStudentService.updateBatchById(pays);
@@ -437,15 +438,15 @@
@RequestMapping("/backStausClass")
@ResponseBody
public void backStausClass(@RequestParam("id") Integer id) {
- MoneyBack byId = moneyBackService.getById(id);
- String[] split = byId.getIds().split(",");
- System.out.println("========split===>" + split);
- List<TCoursePackagePayment> id1 = paymentService.list(new QueryWrapper<TCoursePackagePayment>().in("id", split));
- for (TCoursePackagePayment o : id1) {
- o.setStatus(1);
- o.setAppUserId(null);
- }
- paymentService.updateBatchById(id1);
+// MoneyBack byId = moneyBackService.getById(id);
+// String[] split = byId.getIds().split(",");
+// System.out.println("========split===>" + split);
+// List<CoursePackageOrderStudent> id1 = coursePackageOrderStudentService.list(new QueryWrapper<CoursePackageOrderStudent>().in("id", split));
+// for (CoursePackageOrderStudent o : id1) {
+// o.setStatus(1);
+// o.setAppUserId(null);
+// }
+// coursePackageOrderStudentService.updateBatchById(id1);
}
@RequestMapping("/cancel")
--
Gitblit v1.7.1