From 7cb90b47c42b4ee5944964ad62ae89e7e6a2f9ca Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期五, 17 十一月 2023 09:03:36 +0800
Subject: [PATCH] 后台bug修改
---
cloud-server-course/src/main/java/com/dsh/course/controller/CourseStudentController.java | 28 ++++++++++++++++------------
1 files changed, 16 insertions(+), 12 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 ae124df..0a31b7a 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
@@ -42,7 +42,8 @@
TCoursePackagePaymentService paymentService;
@Autowired
private CourseCounsumService counsumService;
-
+ @Autowired
+ private TCoursePackageService coursePackageService;
//获取退费记录
@RequestMapping("/getRefund")
@ResponseBody
@@ -73,13 +74,16 @@
@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;
@@ -405,8 +409,8 @@
CourseCounsum courseCounsum = new CourseCounsum();
courseCounsum.setInsertTime(new Date());
if (orinPay.getAppUserId()!=studentPay.getAppUserId()){
- courseCounsum.setReason("赠课");
- }else { courseCounsum.setReason("转课");
+ courseCounsum.setReason("课时转移");
+ }else { courseCounsum.setReason("课时转移");
}
courseCounsum.setNum(laveClassHours);
courseCounsum.setChangeType(0);
@@ -425,7 +429,7 @@
CourseCounsum courseCounsum1 = new CourseCounsum();
courseCounsum1.setInsertTime(new Date());
- courseCounsum1.setReason("转课");
+ courseCounsum1.setReason("课时转移");
courseCounsum1.setNum(laveClassHours);
courseCounsum1.setChangeType(1);
courseCounsum1.setPaymentId(studentPay.getId());
@@ -461,7 +465,7 @@
CourseCounsum courseCounsum = new CourseCounsum();
courseCounsum.setInsertTime(new Date());
- courseCounsum.setReason("赠课");
+ courseCounsum.setReason("课时转移");
courseCounsum.setNum(orinPay.getLaveClassHours());
courseCounsum.setChangeType(0);
courseCounsum.setPaymentId(orinPay.getId());
@@ -473,7 +477,7 @@
CourseCounsum courseCounsum1 = new CourseCounsum();
courseCounsum1.setInsertTime(new Date());
- courseCounsum1.setReason("赠课");
+ courseCounsum1.setReason("课时转移");
courseCounsum1.setNum(orinPay.getLaveClassHours());
courseCounsum1.setChangeType(1);
courseCounsum1.setPaymentId(to.getId());
@@ -847,7 +851,7 @@
String join = StringUtils.join(stringArray, ",");
System.out.println("==========join========"+join);
- return "转课成功";
+ return "课时转移成功";
}
--
Gitblit v1.7.1